From fa66b909f382619da15f8c7e323145adfa94fdac Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 25 Jun 2010 18:53:21 +0200 Subject: scsi: scsi_bus_legacy_handle_cmdline() can fail, fix callers None of its callers checks for failure. scsi_hot_add() can crash because of that: (qemu) drive_add 4 if=scsi,format=host_device,file=/dev/sg1 scsi-generic: scsi generic interface too old Segmentation fault (core dumped) Fix all callers, not just scsi_hot_add(). Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- hw/pci-hotplug.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'hw/pci-hotplug.c') diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index c39e640..55c9fe3 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -90,6 +90,9 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter, */ dinfo->unit = qemu_opt_get_number(dinfo->opts, "unit", -1); scsidev = scsi_bus_legacy_add_drive(scsibus, dinfo, dinfo->unit); + if (!scsidev) { + return -1; + } dinfo->unit = scsidev->id; if (printinfo) -- cgit v1.1