Skip to content

Commit d334c2b

Browse files
mlauss2ralfbaechle
authored andcommitted
MIPS: Alchemy: Fix unchecked kstrtoul return value
enabled __must_check logic triggers a build error for mtx1 and gpr in the prom init code. Fix by checking the kstrtoul() return value. Signed-off-by: Manuel Lauss <[email protected]> Cc: Linux-MIPS <[email protected]> Patchwork: https://patchwork.linux-mips.org/patch/6574/ Signed-off-by: Ralf Baechle <[email protected]>
1 parent f517928 commit d334c2b

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

arch/mips/alchemy/board-gpr.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,8 @@ void __init prom_init(void)
5353
prom_init_cmdline();
5454

5555
memsize_str = prom_getenv("memsize");
56-
if (!memsize_str)
56+
if (!memsize_str || kstrtoul(memsize_str, 0, &memsize))
5757
memsize = 0x04000000;
58-
else
59-
strict_strtoul(memsize_str, 0, &memsize);
6058
add_memory_region(0, memsize, BOOT_MEM_RAM);
6159
}
6260

arch/mips/alchemy/board-mtx1.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,8 @@ void __init prom_init(void)
5252
prom_init_cmdline();
5353

5454
memsize_str = prom_getenv("memsize");
55-
if (!memsize_str)
55+
if (!memsize_str || kstrtoul(memsize_str, 0, &memsize))
5656
memsize = 0x04000000;
57-
else
58-
strict_strtoul(memsize_str, 0, &memsize);
5957
add_memory_region(0, memsize, BOOT_MEM_RAM);
6058
}
6159

0 commit comments

Comments
 (0)