Skip to content

Commit f5c7310

Browse files
rppttorvalds
authored andcommitted
init/main: add checks for the return value of memblock_alloc*()
Add panic() calls if memblock_alloc() returns NULL. The panic() format duplicates the one used by memblock itself and in order to avoid explosion with long parameters list replace open coded allocation size calculations with a local variable. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Mike Rapoport <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: Christophe Leroy <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Dennis Zhou <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Greentime Hu <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Guan Xuetao <[email protected]> Cc: Guo Ren <[email protected]> Cc: Guo Ren <[email protected]> [c-sky] Cc: Heiko Carstens <[email protected]> Cc: Juergen Gross <[email protected]> [Xen] Cc: Mark Salter <[email protected]> Cc: Matt Turner <[email protected]> Cc: Max Filippov <[email protected]> Cc: Michael Ellerman <[email protected]> Cc: Michal Simek <[email protected]> Cc: Paul Burton <[email protected]> Cc: Petr Mladek <[email protected]> Cc: Richard Weinberger <[email protected]> Cc: Rich Felker <[email protected]> Cc: Rob Herring <[email protected]> Cc: Rob Herring <[email protected]> Cc: Russell King <[email protected]> Cc: Stafford Horne <[email protected]> Cc: Tony Luck <[email protected]> Cc: Vineet Gupta <[email protected]> Cc: Yoshinori Sato <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent f655f40 commit f5c7310

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

init/main.c

+20-6
Original file line numberDiff line numberDiff line change
@@ -373,12 +373,20 @@ static inline void smp_prepare_cpus(unsigned int maxcpus) { }
373373
*/
374374
static void __init setup_command_line(char *command_line)
375375
{
376-
saved_command_line =
377-
memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
378-
initcall_command_line =
379-
memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
380-
static_command_line = memblock_alloc(strlen(command_line) + 1,
381-
SMP_CACHE_BYTES);
376+
size_t len = strlen(boot_command_line) + 1;
377+
378+
saved_command_line = memblock_alloc(len, SMP_CACHE_BYTES);
379+
if (!saved_command_line)
380+
panic("%s: Failed to allocate %zu bytes\n", __func__, len);
381+
382+
initcall_command_line = memblock_alloc(len, SMP_CACHE_BYTES);
383+
if (!initcall_command_line)
384+
panic("%s: Failed to allocate %zu bytes\n", __func__, len);
385+
386+
static_command_line = memblock_alloc(len, SMP_CACHE_BYTES);
387+
if (!static_command_line)
388+
panic("%s: Failed to allocate %zu bytes\n", __func__, len);
389+
382390
strcpy(saved_command_line, boot_command_line);
383391
strcpy(static_command_line, command_line);
384392
}
@@ -770,8 +778,14 @@ static int __init initcall_blacklist(char *str)
770778
pr_debug("blacklisting initcall %s\n", str_entry);
771779
entry = memblock_alloc(sizeof(*entry),
772780
SMP_CACHE_BYTES);
781+
if (!entry)
782+
panic("%s: Failed to allocate %zu bytes\n",
783+
__func__, sizeof(*entry));
773784
entry->buf = memblock_alloc(strlen(str_entry) + 1,
774785
SMP_CACHE_BYTES);
786+
if (!entry->buf)
787+
panic("%s: Failed to allocate %zu bytes\n",
788+
__func__, strlen(str_entry) + 1);
775789
strcpy(entry->buf, str_entry);
776790
list_add(&entry->next, &blacklisted_initcalls);
777791
}

0 commit comments

Comments
 (0)