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

UBI: don't use array index before testing if it is negative

I can't find anything guaranteeing that 'ubi_num' cannot be <0 in
drivers/mtd/ubi/kapi.c::ubi_open_volume(), and in fact the code
even tests for that and errors out if so. Unfortunately the test
for "ubi_num < 0" happens after we've already used 'ubi_num' as
an array index - bad thing to do if it is negative.
This patch moves the test earlier in the function and then moves
the indexing using that variable after the check. A bit safer :-)

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

authored by

Jesper Juhl and committed by
Artem Bityutskiy
0169b49d 8d2d4011

+7 -2
+7 -2
drivers/mtd/ubi/kapi.c
··· 99 99 { 100 100 int err; 101 101 struct ubi_volume_desc *desc; 102 - struct ubi_device *ubi = ubi_devices[ubi_num]; 102 + struct ubi_device *ubi; 103 103 struct ubi_volume *vol; 104 104 105 105 dbg_msg("open device %d volume %d, mode %d", ubi_num, vol_id, mode); 106 106 107 107 err = -ENODEV; 108 + if (ubi_num < 0) 109 + return ERR_PTR(err); 110 + 111 + ubi = ubi_devices[ubi_num]; 112 + 108 113 if (!try_module_get(THIS_MODULE)) 109 114 return ERR_PTR(err); 110 115 111 - if (ubi_num < 0 || ubi_num >= UBI_MAX_DEVICES || !ubi) 116 + if (ubi_num >= UBI_MAX_DEVICES || !ubi) 112 117 goto out_put; 113 118 114 119 err = -EINVAL;