[patch] qemu-CVE-2008-1945.patch

qemu-CVE-2008-1945.patch (text/plain), 1.98 KB, created by Robert Buchholz (RETIRED) on 2008-08-19 20:24:16 UTC

------------------------------------------------------------------------
r4747 | aurel32 | 2008-06-19 00:10:01 +0200 (Thu, 19 Jun 2008) | 6 lines

Add image format option in monitor for removable media

(Chris Wright)

CVE-2008-1945

------------------------------------------------------------------------
Index: monitor.c
===================================================================
--- monitor.c	(revision 4746)
+++ monitor.c	(revision 4747)
@@ -396,18 +396,26 @@
     eject_device(bs, force);
 }
 
-static void do_change_block(const char *device, const char *filename)
+static void do_change_block(const char *device, const char *filename, const char *fmt)
 {
     BlockDriverState *bs;
+    BlockDriver *drv = NULL;
 
     bs = bdrv_find(device);
     if (!bs) {
         term_printf("device not found\n");
         return;
     }
+    if (fmt) {
+        drv = bdrv_find_format(fmt);
+        if (!drv) {
+            term_printf("invalid format %s\n", fmt);
+            return;
+        }
+    }
     if (eject_device(bs, 0) < 0)
         return;
-    bdrv_open(bs, filename, 0);
+    bdrv_open2(bs, filename, 0, drv);
     qemu_key_check(bs, filename);
 }
 
@@ -426,12 +434,12 @@
     }
 }
 
-static void do_change(const char *device, const char *target)
+static void do_change(const char *device, const char *target, const char *fmt)
 {
     if (strcmp(device, "vnc") == 0) {
 	do_change_vnc(target);
     } else {
-	do_change_block(device, target);
+	do_change_block(device, target, fmt);
     }
 }
 
@@ -1339,8 +1347,8 @@
       "", "quit the emulator" },
     { "eject", "-fB", do_eject,
       "[-f] device", "eject a removable medium (use -f to force it)" },
-    { "change", "BF", do_change,
-      "device filename", "change a removable medium" },
+    { "change", "BFs?", do_change,
+      "device filename [format]", "change a removable medium, optional format" },
     { "screendump", "F", do_screen_dump,
       "filename", "save screen into PPM image 'filename'" },
     { "logfile", "F", do_logfile,