Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9096f58 authored by Nigel Croxon's avatar Nigel Croxon Committed by Greg Kroah-Hartman
Browse files

md/raid1: fix error: ISO C90 forbids mixed declarations 



[ Upstream commit df203da47f4428bc286fc99318936416253a321c ]

There is a compile error when this commit is added:
md: raid1: fix potential OOB in raid1_remove_disk()

drivers/md/raid1.c: In function 'raid1_remove_disk':
drivers/md/raid1.c:1844:9: error: ISO C90 forbids mixed declarations
and code [-Werror=declaration-after-statement]
1844 |         struct raid1_info *p = conf->mirrors + number;
     |         ^~~~~~

That's because the new code was inserted before the struct.
The change is move the struct command above this commit.

Fixes: 8b0472b50bcf ("md: raid1: fix potential OOB in raid1_remove_disk()")
Signed-off-by: default avatarNigel Croxon <ncroxon@redhat.com>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Link: https://lore.kernel.org/r/46d929d0-2aab-4cf2-b2bf-338963e8ba5a@redhat.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 039ec9db

drivers/md/raid1.c

+1 −2
Original line number Diff line number Diff line
@@ -1783,12 +1783,11 @@ static int raid1_remove_disk(struct mddev *mddev, struct md_rdev *rdev) 
	struct r1conf *conf = mddev->private;

	int err = 0;

	int number = rdev->raid_disk;

	struct raid1_info *p = conf->mirrors + number;



	if (unlikely(number >= conf->raid_disks))

		goto abort;



	struct raid1_info *p = conf->mirrors + number;



	if (rdev != p->rdev)

		p = conf->mirrors + conf->raid_disks + number;