[Xen-devel] [PATCH 17/21] init/main: add checks for the return value of memblock_alloc*()

[Mike Rapoport <rppt@xxxxxxxxxxxxx>]

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.

Signed-off-by: Mike Rapoport <rppt@xxxxxxxxxxxxx>
---
 init/main.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/init/main.c b/init/main.c
index a56f65a..d58a365 100644
--- a/init/main.c
+++ b/init/main.c
@@ -373,12 +373,20 @@ static inline void smp_prepare_cpus(unsigned int maxcpus) 
{ }
  */
 static void __init setup_command_line(char *command_line)
 {
-       saved_command_line =
-               memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
-       initcall_command_line =
-               memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES);
-       static_command_line = memblock_alloc(strlen(command_line) + 1,
-                                            SMP_CACHE_BYTES);
+       size_t len = strlen(boot_command_line) + 1;
+
+       saved_command_line = memblock_alloc(len, SMP_CACHE_BYTES);
+       if (!saved_command_line)
+               panic("%s: Failed to allocate %zu bytes\n", __func__, len);
+
+       initcall_command_line = memblock_alloc(len, SMP_CACHE_BYTES);
+       if (!initcall_command_line)
+               panic("%s: Failed to allocate %zu bytes\n", __func__, len);
+
+       static_command_line = memblock_alloc(len, SMP_CACHE_BYTES);
+       if (!static_command_line)
+               panic("%s: Failed to allocate %zu bytes\n", __func__, len);
+
        strcpy(saved_command_line, boot_command_line);
        strcpy(static_command_line, command_line);
 }
@@ -773,8 +781,14 @@ static int __init initcall_blacklist(char *str)
                        pr_debug("blacklisting initcall %s\n", str_entry);
                        entry = memblock_alloc(sizeof(*entry),
                                               SMP_CACHE_BYTES);
+                       if (!entry)
+                               panic("%s: Failed to allocate %zu bytes\n",
+                                     __func__, sizeof(*entry));
                        entry->buf = memblock_alloc(strlen(str_entry) + 1,
                                                    SMP_CACHE_BYTES);
+                       if (!entry->buf)
+                               panic("%s: Failed to allocate %zu bytes\n",
+                                     __func__, strlen(str_entry) + 1);
                        strcpy(entry->buf, str_entry);
                        list_add(&entry->next, &blacklisted_initcalls);
                }
-- 
2.7.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel