diff mbox

[PULL,46/58] qdev-monitor: Fix crash when device_add is called with abstract driver

Message ID 1381254296-3203-47-git-send-email-afaerber@suse.de
State New
Headers show

Commit Message

Andreas Färber Oct. 8, 2013, 5:44 p.m. UTC 
From: Igor Mammedov <imammedo@redhat.com>

User is able to crash running QEMU when following monitor
command is called:

 device_add intel-hda-generic

Crash is caused by assertion in object_initialize_with_type()
when type is abstract.

Checking if type is abstract before instance is created in
qdev_device_add() allows to prevent crash on incorrect user input.

Cc: qemu-stable@nongnu.org
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 qdev-monitor.c | 6 ++++++
 1 file changed, 6 insertions(+)
diff mbox

Patch

diff --git a/qdev-monitor.c b/qdev-monitor.c
index 51bfec0..b1ce26a 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -472,6 +472,12 @@  DeviceState *qdev_device_add(QemuOpts *opts)
         return NULL;
     }
 
+    if (object_class_is_abstract(oc)) {
+        qerror_report(QERR_INVALID_PARAMETER_VALUE, "driver",
+                      "non-abstract device type");
+        return NULL;
+    }
+
     dc = DEVICE_CLASS(oc);
 
     /* find bus */