Commit 02b898f2 authored Oct 31, 2012 by NeilBrown

md/raid1: Fix assembling of arrays containing Replacements.



setup_conf in raid1.c uses conf->raid_disks before assigning
a value.  It is used when including 'Replacement' devices.

The consequence is that assembling an array which contains a
replacement will misbehave and either not include the replacement, or
not include the device being replaced.

Though this doesn't lead directly to data corruption, it could lead to
reduced data safety.

So use mddev->raid_disks, which is initialised, instead.

Bug was introduced by commit c19d5798
      md/raid1: recognise replacements when assembling arrays.

in 3.3, so fix is suitable for 3.3.y thru 3.6.y.

Cc: stable@vger.kernel.org
Signed-off-by: NeilBrown <neilb@suse.de>

parent 0be1fecd

drivers/md/raid1.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2710,7 +2710,7 @@ static struct r1conf setup_conf(struct mddev mddev)
		\|\| disk_idx < 0)
		continue;
		if (test_bit(Replacement, &rdev->flags))
		disk = conf->mirrors + conf->raid_disks + disk_idx;
		disk = conf->mirrors + mddev->raid_disks + disk_idx;
		else
		disk = conf->mirrors + disk_idx;

Admin message