]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ubi: Add a check for ubi_num
authorDenis Arefev <arefev@swemel.ru>
Mon, 2 Dec 2024 09:36:52 +0000 (12:36 +0300)
committerRichard Weinberger <richard@nod.at>
Sat, 18 Jan 2025 14:22:04 +0000 (15:22 +0100)
Added a check for ubi_num for negative numbers
If the variable ubi_num takes negative values then we get:

qemu-system-arm ... -append "ubi.mtd=0,0,0,-22222345" ...
[    0.745065]  ubi_attach_mtd_dev from ubi_init+0x178/0x218
[    0.745230]  ubi_init from do_one_initcall+0x70/0x1ac
[    0.745344]  do_one_initcall from kernel_init_freeable+0x198/0x224
[    0.745474]  kernel_init_freeable from kernel_init+0x18/0x134
[    0.745600]  kernel_init from ret_from_fork+0x14/0x28
[    0.745727] Exception stack(0x90015fb0 to 0x90015ff8)

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 83ff59a06663 ("UBI: support ubi_num on mtd.ubi command line")
Cc: stable@vger.kernel.org
Signed-off-by: Denis Arefev <arefev@swemel.ru>
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
drivers/mtd/ubi/build.c

index 30be4ed68fad297c3c8f6ba8f0214345f9ae3ffe..ef6a22f372f95cd7de07be715d60fd117c75f2dc 100644 (file)
@@ -1537,7 +1537,7 @@ static int ubi_mtd_param_parse(const char *val, const struct kernel_param *kp)
        if (token) {
                int err = kstrtoint(token, 10, &p->ubi_num);
 
-               if (err) {
+               if (err || p->ubi_num < UBI_DEV_NUM_AUTO) {
                        pr_err("UBI error: bad value for ubi_num parameter: %s\n",
                               token);
                        return -EINVAL;