Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

md linear: fix a race between linear_add() and linear_congested()

Recently I receive a bug report that on Linux v3.0 based kerenl, hot add
disk to a md linear device causes kernel crash at linear_congested(). From
the crash image analysis, I find in linear_congested(), mddev->raid_disks
contains value N, but conf->disks[] only has N-1 pointers available. Then
a NULL pointer deference crashes the kernel.

There is a race between linear_add() and linear_congested(), RCU stuffs
used in these two functions cannot avoid the race. Since Linuv v4.0
RCU code is replaced by introducing mddev_suspend(). After checking the
upstream code, it seems linear_congested() is not called in
generic_make_request() code patch, so mddev_suspend() cannot provent it
from being called. The possible race still exists.

Here I explain how the race still exists in current code. For a machine
has many CPUs, on one CPU, linear_add() is called to add a hard disk to a
md linear device; at the same time on other CPU, linear_congested() is
called to detect whether this md linear device is congested before issuing
an I/O request onto it.

Now I use a possible code execution time sequence to demo how the possible
race happens,

seq linear_add() linear_congested()
0 conf=mddev->private
1 oldconf=mddev->private
2 mddev->raid_disks++
3 for (i=0; i<mddev->raid_disks;i++)
4 bdev_get_queue(conf->disks[i].rdev->bdev)
5 mddev->private=newconf

In linear_add() mddev->raid_disks is increased in time seq 2, and on
another CPU in linear_congested() the for-loop iterates conf->disks[i] by
the increased mddev->raid_disks in time seq 3,4. But conf with one more
element (which is a pointer to struct dev_info type) to conf->disks[] is
not updated yet, accessing its structure member in time seq 4 will cause a
NULL pointer deference fault.

To fix this race, there are 2 parts of modification in the patch,
1) Add 'int raid_disks' in struct linear_conf, as a copy of
mddev->raid_disks. It is initialized in linear_conf(), always being
consistent with pointers number of 'struct dev_info disks[]'. When
iterating conf->disks[] in linear_congested(), use conf->raid_disks to
replace mddev->raid_disks in the for-loop, then NULL pointer deference
will not happen again.
2) RCU stuffs are back again, and use kfree_rcu() in linear_add() to
free oldconf memory. Because oldconf may be referenced as mddev->private
in linear_congested(), kfree_rcu() makes sure that its memory will not
be released until no one uses it any more.
Also some code comments are added in this patch, to make this modification
to be easier understandable.

This patch can be applied for kernels since v4.0 after commit:
3be260cc18f8 ("md/linear: remove rcu protections in favour of
suspend/resume"). But this bug is reported on Linux v3.0 based kernel, for
people who maintain kernels before Linux v4.0, they need to do some back
back port to this patch.

Changelog:
- V3: add 'int raid_disks' in struct linear_conf, and use kfree_rcu() to
replace rcu_call() in linear_add().
- v2: add RCU stuffs by suggestion from Shaohua and Neil.
- v1: initial effort.

Signed-off-by: Coly Li <colyli@suse.de>
Cc: Shaohua Li <shli@fb.com>
Cc: Neil Brown <neilb@suse.com>
Cc: stable@vger.kernel.org
Signed-off-by: Shaohua Li <shli@fb.com>

authored by

colyli@suse.de and committed by
Shaohua Li
03a9e24e 7089db84

+35 -5
+34 -5
drivers/md/linear.c
··· 53 53 return conf->disks + lo; 54 54 } 55 55 56 + /* 57 + * In linear_congested() conf->raid_disks is used as a copy of 58 + * mddev->raid_disks to iterate conf->disks[], because conf->raid_disks 59 + * and conf->disks[] are created in linear_conf(), they are always 60 + * consitent with each other, but mddev->raid_disks does not. 61 + */ 56 62 static int linear_congested(struct mddev *mddev, int bits) 57 63 { 58 64 struct linear_conf *conf; 59 65 int i, ret = 0; 60 66 61 - conf = mddev->private; 67 + rcu_read_lock(); 68 + conf = rcu_dereference(mddev->private); 62 69 63 - for (i = 0; i < mddev->raid_disks && !ret ; i++) { 70 + for (i = 0; i < conf->raid_disks && !ret ; i++) { 64 71 struct request_queue *q = bdev_get_queue(conf->disks[i].rdev->bdev); 65 72 ret |= bdi_congested(&q->backing_dev_info, bits); 66 73 } 67 74 75 + rcu_read_unlock(); 68 76 return ret; 69 77 } 70 78 ··· 152 144 conf->disks[i-1].end_sector + 153 145 conf->disks[i].rdev->sectors; 154 146 147 + /* 148 + * conf->raid_disks is copy of mddev->raid_disks. The reason to 149 + * keep a copy of mddev->raid_disks in struct linear_conf is, 150 + * mddev->raid_disks may not be consistent with pointers number of 151 + * conf->disks[] when it is updated in linear_add() and used to 152 + * iterate old conf->disks[] earray in linear_congested(). 153 + * Here conf->raid_disks is always consitent with number of 154 + * pointers in conf->disks[] array, and mddev->private is updated 155 + * with rcu_assign_pointer() in linear_addr(), such race can be 156 + * avoided. 157 + */ 158 + conf->raid_disks = raid_disks; 159 + 155 160 return conf; 156 161 157 162 out: ··· 217 196 if (!newconf) 218 197 return -ENOMEM; 219 198 199 + /* newconf->raid_disks already keeps a copy of * the increased 200 + * value of mddev->raid_disks, WARN_ONCE() is just used to make 201 + * sure of this. It is possible that oldconf is still referenced 202 + * in linear_congested(), therefore kfree_rcu() is used to free 203 + * oldconf until no one uses it anymore. 204 + */ 220 205 mddev_suspend(mddev); 221 - oldconf = mddev->private; 206 + oldconf = rcu_dereference(mddev->private); 222 207 mddev->raid_disks++; 223 - mddev->private = newconf; 208 + WARN_ONCE(mddev->raid_disks != newconf->raid_disks, 209 + "copied raid_disks doesn't match mddev->raid_disks"); 210 + rcu_assign_pointer(mddev->private, newconf); 224 211 md_set_array_sectors(mddev, linear_size(mddev, 0, 0)); 225 212 set_capacity(mddev->gendisk, mddev->array_sectors); 226 213 mddev_resume(mddev); 227 214 revalidate_disk(mddev->gendisk); 228 - kfree(oldconf); 215 + kfree_rcu(oldconf, rcu); 229 216 return 0; 230 217 } 231 218
+1
drivers/md/linear.h
··· 10 10 { 11 11 struct rcu_head rcu; 12 12 sector_t array_sectors; 13 + int raid_disks; /* a copy of mddev->raid_disks */ 13 14 struct dev_info disks[0]; 14 15 }; 15 16 #endif