From: M. Mohan Kumar <mohan@in.ibm.com>
Date: Mon, 12 Apr 2010 04:31:33 +0000 (+0530)
Subject: Check for invalid initrd file
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d6fa4b77fb8f27ac84cf23fb1e15016673d98a47;p=qemu.git

Check for invalid initrd file

When qemu is invoked with an invalid initrd file, it crashes. Following
patch prints a error message and exits if an invalid initrd is
specified. Includes changes suggested by JV.

Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/hw/pc.c b/hw/pc.c
index 69e597f3e2..b797f218f7 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -658,6 +658,12 @@ static void load_linux(void *fw_cfg,
 	}
 
 	initrd_size = get_image_size(initrd_filename);
+        if (initrd_size < 0) {
+            fprintf(stderr, "qemu: error reading initrd %s\n",
+                    initrd_filename);
+            exit(1);
+        }
+
         initrd_addr = (initrd_max-initrd_size) & ~4095;
 
         initrd_data = qemu_malloc(initrd_size);