From patchwork Fri Jun 25 16:53:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 56957 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DAFF0B6F10 for ; Sat, 26 Jun 2010 04:57:27 +1000 (EST) Received: from localhost ([127.0.0.1]:56851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OSE45-0004yc-6e for incoming@patchwork.ozlabs.org; Fri, 25 Jun 2010 14:55:49 -0400 Received: from [140.186.70.92] (port=44249 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OSCvY-0002Fg-CL for qemu-devel@nongnu.org; Fri, 25 Jun 2010 13:42:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OSC9o-0008Lz-7i for qemu-devel@nongnu.org; Fri, 25 Jun 2010 12:53:41 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:34412) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OSC9n-0008FI-Vr for qemu-devel@nongnu.org; Fri, 25 Jun 2010 12:53:36 -0400 Received: from blackfin.pond.sub.org (pD9E39B39.dip.t-dialin.net [217.227.155.57]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 0DD25276D78; Fri, 25 Jun 2010 18:53:33 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 3122F28; Fri, 25 Jun 2010 18:53:32 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 25 Jun 2010 18:53:21 +0200 Message-Id: <1277484812-22012-2-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1277484812-22012-1-git-send-email-armbru@redhat.com> References: <1277484812-22012-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: kwolf@redhat.com, kraxel@redhat.com, hch@lst.de Subject: [Qemu-devel] [PATCH 01/12] scsi: scsi_bus_legacy_handle_cmdline() can fail, fix callers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Reviewed-by: Christoph Hellwig --- hw/esp.c | 3 +-- hw/lsi53c895a.c | 2 +- hw/pci-hotplug.c | 3 +++ hw/scsi-bus.c | 11 +++++++---- hw/scsi.h | 2 +- hw/usb-msd.c | 3 +++ 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/hw/esp.c b/hw/esp.c index 7740879..349052a 100644 --- a/hw/esp.c +++ b/hw/esp.c @@ -679,8 +679,7 @@ static int esp_init1(SysBusDevice *dev) qdev_init_gpio_in(&dev->qdev, parent_esp_reset, 1); scsi_bus_new(&s->bus, &dev->qdev, 0, ESP_MAX_DEVS, esp_command_complete); - scsi_bus_legacy_handle_cmdline(&s->bus); - return 0; + return scsi_bus_legacy_handle_cmdline(&s->bus); } static SysBusDeviceInfo esp_info = { diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index f5a91ba..c2a8010 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -2176,7 +2176,7 @@ static int lsi_scsi_init(PCIDevice *dev) scsi_bus_new(&s->bus, &dev->qdev, 1, LSI_MAX_DEVS, lsi_command_complete); if (!dev->qdev.hotplugged) { - scsi_bus_legacy_handle_cmdline(&s->bus); + return scsi_bus_legacy_handle_cmdline(&s->bus); } return 0; } 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) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 24bd060..d5b66c1 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -83,7 +83,6 @@ void scsi_qdev_register(SCSIDeviceInfo *info) } /* handle legacy '-drive if=scsi,...' cmd line args */ -/* FIXME callers should check for failure, but don't */ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, DriveInfo *dinfo, int unit) { const char *driver; @@ -98,18 +97,22 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, DriveInfo *dinfo, int unit) return DO_UPCAST(SCSIDevice, qdev, dev); } -void scsi_bus_legacy_handle_cmdline(SCSIBus *bus) +int scsi_bus_legacy_handle_cmdline(SCSIBus *bus) { DriveInfo *dinfo; - int unit; + int res = 0, unit; for (unit = 0; unit < MAX_SCSI_DEVS; unit++) { dinfo = drive_get(IF_SCSI, bus->busnr, unit); if (dinfo == NULL) { continue; } - scsi_bus_legacy_add_drive(bus, dinfo, unit); + if (!scsi_bus_legacy_add_drive(bus, dinfo, unit)) { + res = -1; + break; + } } + return res; } void scsi_dev_clear_sense(SCSIDevice *dev) diff --git a/hw/scsi.h b/hw/scsi.h index b668e27..b1b5f73 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -98,7 +98,7 @@ static inline SCSIBus *scsi_bus_from_device(SCSIDevice *d) } SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, DriveInfo *dinfo, int unit); -void scsi_bus_legacy_handle_cmdline(SCSIBus *bus); +int scsi_bus_legacy_handle_cmdline(SCSIBus *bus); void scsi_dev_clear_sense(SCSIDevice *dev); void scsi_dev_set_sense(SCSIDevice *dev, uint8_t key); diff --git a/hw/usb-msd.c b/hw/usb-msd.c index 003bd8a..8e9718c 100644 --- a/hw/usb-msd.c +++ b/hw/usb-msd.c @@ -531,6 +531,9 @@ static int usb_msd_initfn(USBDevice *dev) s->dev.speed = USB_SPEED_FULL; scsi_bus_new(&s->bus, &s->dev.qdev, 0, 1, usb_msd_command_complete); s->scsi_dev = scsi_bus_legacy_add_drive(&s->bus, s->conf.dinfo, 0); + if (!s->scsi_dev) { + return -1; + } s->bus.qbus.allow_hotplug = 0; usb_msd_handle_reset(dev);