evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

crush: fix crash from invalid 'take' argument

Browse source 
Verify that the 'take' argument is a valid device or bucket.
Otherwise ignore it (do not add the value to the working vector).

Reflects ceph.git commit 9324d0a1af61e1c234cc48e2175b4e6320fff8f4.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov 2015-06-12 11:20:03 +03:00
parent 687265e5a8
commit 8f529795ba
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/ceph/crush/mapper.c
View file

@ -790,8 +790,15 @@ int crush_do_rule(const struct crush_map *map,
switch (curstep->op) { switch (curstep->op) {
case CRUSH_RULE_TAKE: case CRUSH_RULE_TAKE:
if ((curstep->arg1 >= 0 &&
curstep->arg1 < map->max_devices) ||
(-1-curstep->arg1 < map->max_buckets &&
map->buckets[-1-curstep->arg1])) {
w[0] = curstep->arg1; w[0] = curstep->arg1;
wsize = 1; wsize = 1;
} else {
dprintk(" bad take value %d\n", curstep->arg1);
}
break; break;
case CRUSH_RULE_SET_CHOOSE_TRIES: case CRUSH_RULE_SET_CHOOSE_TRIES: