]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
mtd: slram: insert break after errors in parsing the map
authorMirsad Todorovac <mtodorovac69@gmail.com>
Thu, 11 Jul 2024 23:43:20 +0000 (01:43 +0200)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Fri, 23 Aug 2024 17:25:46 +0000 (19:25 +0200)
GCC 12.3.0 compiler on linux-next next-20240709 tree found the execution
path in which, due to lazy evaluation, devlength isn't initialised with the
parsed string:

   289 while (map) {
   290 devname = devstart = devlength = NULL;
   291
   292 if (!(devname = strsep(&map, ","))) {
   293 E("slram: No devicename specified.\n");
   294 break;
   295 }
   296 T("slram: devname = %s\n", devname);
   297 if ((!map) || (!(devstart = strsep(&map, ",")))) {
   298 E("slram: No devicestart specified.\n");
   299 }
   300 T("slram: devstart = %s\n", devstart);
 → 301 if ((!map) || (!(devlength = strsep(&map, ",")))) {
   302 E("slram: No devicelength / -end specified.\n");
   303 }
 → 304 T("slram: devlength = %s\n", devlength);
   305 if (parse_cmdline(devname, devstart, devlength) != 0) {
   306 return(-EINVAL);
   307 }

Parsing should be finished after map == NULL, so a break is best inserted after
each E("slram: ... \n") error message.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Vignesh Raghavendra <vigneshr@ti.com>
Cc: linux-mtd@lists.infradead.org
Signed-off-by: Mirsad Todorovac <mtodorovac69@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20240711234319.637824-1-mtodorovac69@gmail.com
drivers/mtd/devices/slram.c

index 28131a127d065e4e8aacf422d8a1724685a98949..8297b366a0669942325382525ab468aabecd6abb 100644 (file)
@@ -296,10 +296,12 @@ static int __init init_slram(void)
                T("slram: devname = %s\n", devname);
                if ((!map) || (!(devstart = strsep(&map, ",")))) {
                        E("slram: No devicestart specified.\n");
+                       break;
                }
                T("slram: devstart = %s\n", devstart);
                if ((!map) || (!(devlength = strsep(&map, ",")))) {
                        E("slram: No devicelength / -end specified.\n");
+                       break;
                }
                T("slram: devlength = %s\n", devlength);
                if (parse_cmdline(devname, devstart, devlength) != 0) {