From f9a63d3a640cb30a12598cedc0dd7d8b6fc5b4de Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Thu, 1 Aug 2013 15:25:53 +0800 Subject: discover: fix segfault on failed boot image load If the boot image fails to load, we end up calling talloc_free on an unitialised are of stack (boot_task.local_initrd). Move the initialisers a little earlier, so we always NULL pointers before potentially freeing. Signed-off-by: Jeremy Kerr --- discover/boot.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'discover/boot.c') diff --git a/discover/boot.c b/discover/boot.c index ed30ef9..e57810d 100644 --- a/discover/boot.c +++ b/discover/boot.c @@ -321,6 +321,9 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd, result = -1; + boot_task.local_initrd = NULL; + boot_task.local_dtb = NULL; + update_status(status_fn, status_arg, BOOT_STATUS_INFO, "loading kernel"); boot_task.local_image = load_url(NULL, image, &clean_image); @@ -330,7 +333,6 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd, goto no_load; } - boot_task.local_initrd = NULL; if (initrd) { update_status(status_fn, status_arg, BOOT_STATUS_INFO, "loading initrd"); @@ -342,7 +344,6 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd, } } - boot_task.local_dtb = NULL; if (dtb) { update_status(status_fn, status_arg, BOOT_STATUS_INFO, "loading device tree"); -- cgit v1.1