qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH] pc_init: Fail on bad kernel


From: Sasha Levin
Subject: [Qemu-devel] [PATCH] pc_init: Fail on bad kernel
Date: Sat, 3 Sep 2011 22:35:43 +0300

When providing QEMU with a bad '-kernel' parameter, such as a file which
is not really a kernel, QEMU will attempt to allocate a huge amount of
memory and fail either with "Failed to allocate memory: Cannot allocate
memory" or a GLib error: "GLib-ERROR **: gmem.c:170: failed to allocate
18446744073709529965 bytes"

This patch handles the case where the magic sig wasn't located in the
provided kernel, and loading it as multiboot failed as well.

Cc: Anthony Liguori <address@hidden>
Signed-off-by: Sasha Levin <address@hidden>
---
 hw/pc.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/hw/pc.c b/hw/pc.c
index 6b3662e..428440b 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -691,8 +691,14 @@ static void load_linux(void *fw_cfg,
        /* This looks like a multiboot kernel. If it is, let's stop
           treating it like a Linux kernel. */
         if (load_multiboot(fw_cfg, f, kernel_filename, initrd_filename,
-                           kernel_cmdline, kernel_size, header))
+                           kernel_cmdline, kernel_size, header)) {
             return;
+        } else {
+            fprintf(stderr, "qemu: could not load kernel '%s': %s\n",
+                   kernel_filename, strerror(errno));
+           exit(1);
+        }
+           
        protocol = 0;
     }
 
-- 
1.7.6.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]