summary refs log tree commit diff stats
path: root/hw/i386/multiboot.c
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@redhat.com>2022-08-19 16:39:28 +0100
committerPeter Maydell <peter.maydell@linaro.org>2022-09-22 16:38:28 +0100
commitfa87341dabebe79d2e5577432a98b83c9eddf968 (patch)
tree117c374d99a0c8c670dc70df3d0c61f75df2264c /hw/i386/multiboot.c
parent7650c8fe520c67c3b36f6962c4ad990f56ad40b8 (diff)
downloadfocaccia-qemu-fa87341dabebe79d2e5577432a98b83c9eddf968.tar.gz
focaccia-qemu-fa87341dabebe79d2e5577432a98b83c9eddf968.zip
hw/i386/multiboot: Avoid dynamic stack allocation
Use autofree heap allocation instead of variable-length array on
the stack. Replace the snprintf() call by g_strdup_printf().

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20220819153931.3147384-9-peter.maydell@linaro.org
Diffstat (limited to 'hw/i386/multiboot.c')
-rw-r--r--hw/i386/multiboot.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
index 0a10089f14..963e29362e 100644
--- a/hw/i386/multiboot.c
+++ b/hw/i386/multiboot.c
@@ -163,6 +163,7 @@ int load_multiboot(X86MachineState *x86ms,
     uint8_t *mb_bootinfo_data;
     uint32_t cmdline_len;
     GList *mods = NULL;
+    g_autofree char *kcmdline = NULL;
 
     /* Ok, let's see if it is a multiboot image.
        The header is 12x32bit long, so the latest entry may be 8192 - 48. */
@@ -362,9 +363,7 @@ int load_multiboot(X86MachineState *x86ms,
     }
 
     /* Commandline support */
-    char kcmdline[strlen(kernel_filename) + strlen(kernel_cmdline) + 2];
-    snprintf(kcmdline, sizeof(kcmdline), "%s %s",
-             kernel_filename, kernel_cmdline);
+    kcmdline = g_strdup_printf("%s %s", kernel_filename, kernel_cmdline);
     stl_p(bootinfo + MBI_CMDLINE, mb_add_cmdline(&mbs, kcmdline));
 
     stl_p(bootinfo + MBI_BOOTLOADER, mb_add_bootloader(&mbs, bootloader_name));