From: Paolo Bonzini Date: Fri, 23 Nov 2012 15:56:18 +0000 (+0100) Subject: hmp: do not crash on invalid SCSI hotplug X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~2993 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5007bcc9729acd995518c52eb1038c4d8416b5d;p=sdk%2Femulator%2Fqemu.git hmp: do not crash on invalid SCSI hotplug Commit 0d93692 (qdev: Convert busses to QEMU Object Model, 2012-05-02) removed a check on the type of the bus where a SCSI disk is hotplugged. However, hot-plugging to the wrong kind of device now causes a crash due to either a NULL pointer dereference (avoided by the previous patch) or a failed QOM cast. Instead, in this case we need to use object_dynamic_cast and check for the result, similar to what was done before that commit. Reported-by: Markus Armbruster Signed-off-by: Paolo Bonzini Signed-off-by: Anthony Liguori --- diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index e7fb780..0ca5546 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -80,7 +80,13 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter, SCSIBus *scsibus; SCSIDevice *scsidev; - scsibus = SCSI_BUS(QLIST_FIRST(&adapter->child_bus)); + scsibus = (SCSIBus *) + object_dynamic_cast(OBJECT(QLIST_FIRST(&adapter->child_bus)), + TYPE_SCSI_BUS); + if (!scsibus) { + error_report("Device is not a SCSI adapter"); + return -1; + } /* * drive_init() tries to find a default for dinfo->unit. Doesn't