From patchwork Tue Jul 13 15:54:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 58797 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 E3FA1B6F1B for ; Wed, 14 Jul 2010 02:01:17 +1000 (EST) Received: from localhost ([127.0.0.1]:59298 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYhv0-0000VV-Mb for incoming@patchwork.ozlabs.org; Tue, 13 Jul 2010 12:01:14 -0400 Received: from [140.186.70.92] (port=51631 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYhoc-0006Kt-TT for qemu-devel@nongnu.org; Tue, 13 Jul 2010 11:54:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYhoa-0001ZV-OI for qemu-devel@nongnu.org; Tue, 13 Jul 2010 11:54:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65286) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYhoa-0001ZA-G3 for qemu-devel@nongnu.org; Tue, 13 Jul 2010 11:54:36 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6DFsYfA018995 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Jul 2010 11:54:34 -0400 Received: from dhcp-5-188.str.redhat.com (dhcp-5-217.str.redhat.com [10.32.5.217]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6DFsSao006368; Tue, 13 Jul 2010 11:54:33 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Tue, 13 Jul 2010 17:54:25 +0200 Message-Id: <1279036466-19934-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1279036466-19934-1-git-send-email-kwolf@redhat.com> References: <1279036466-19934-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 4/5] virtio-blk: Fix virtio-blk-s390 to require drive 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 From: Markus Armbruster 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 Signed-off-by: Kevin Wolf --- 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 8747634..99e9dd2 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 5583166..31a711e 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -546,10 +546,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;