From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=46852 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OW7PP-0005z9-Ty for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:37:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OW7PM-00080B-1P for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:37:55 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:60882) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OW7PL-0007ze-Qx for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:37:51 -0400 From: Markus Armbruster Date: Tue, 6 Jul 2010 14:37:43 +0200 Message-Id: <1278419869-26126-3-git-send-email-armbru@redhat.com> In-Reply-To: <1278419869-26126-1-git-send-email-armbru@redhat.com> References: <1278419869-26126-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 2/8] virtio-blk: Fix virtio-blk-s390 to require drive List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, kraxel@redhat.com, hch@lst.de Move the check from virtio_blk_init_pci(), where it protects only virtio-blk-pci, to virtio_blk_init(). Without that, virtio-blk-s390 initializes without a drive. I figure that can lead to null pointer dereferences. Signed-off-by: Markus Armbruster --- hw/virtio-blk.c | 6 ++++++ hw/virtio-pci.c | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 0bd57b5..2de1a5a 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -12,6 +12,7 @@ */ #include +#include "qemu-error.h" #include "virtio-blk.h" #ifdef __linux__ # include @@ -490,6 +491,11 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf) static int virtio_blk_id; DriveInfo *dinfo; + if (!conf->bs) { + error_report("virtio-blk-pci: drive property not set"); + return NULL; + } + s = (VirtIOBlock *)virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK, sizeof(struct virtio_blk_config), sizeof(VirtIOBlock)); diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index c6edcc2..a4d6d6b 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -547,10 +547,6 @@ static int virtio_blk_init_pci(PCIDevice *pci_dev) proxy->class_code != PCI_CLASS_STORAGE_OTHER) proxy->class_code = PCI_CLASS_STORAGE_SCSI; - if (!proxy->block.bs) { - error_report("virtio-blk-pci: drive property not set"); - return -1; - } vdev = virtio_blk_init(&pci_dev->qdev, &proxy->block); if (!vdev) { return -1; -- 1.6.6.1