From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49023) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1xnz-0007yv-8I for qemu-devel@nongnu.org; Thu, 26 Nov 2015 09:45:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1xnw-00015q-0x for qemu-devel@nongnu.org; Thu, 26 Nov 2015 09:45:51 -0500 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:38934) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1xnv-00015R-Mn for qemu-devel@nongnu.org; Thu, 26 Nov 2015 09:45:47 -0500 Received: from localhost by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 26 Nov 2015 14:45:45 -0000 From: "Eugene (jno) Dvurechenski" Date: Thu, 26 Nov 2015 15:45:35 +0100 Message-Id: <1448549135-6582-2-git-send-email-jno@linux.vnet.ibm.com> In-Reply-To: <1448549135-6582-1-git-send-email-jno@linux.vnet.ibm.com> References: <1448549135-6582-1-git-send-email-jno@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v1 1/1] (for-2.5) virtio-scsi: don't crash without a valid device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Cornelia Huck , Paolo Bonzini , qemu-stable@nongnu.org, "Michael S. Tsirkin" Make sure that we actually have a device when checking the aio context. Otherwise guests could trigger QEMU crashes. Signed-off-by: "Eugene (jno) Dvurechenski" Reviewed-by: David Hildenbrand --- hw/scsi/virtio-scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 7655401..3a4f520 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -250,7 +250,7 @@ static int virtio_scsi_do_tmf(VirtIOSCSI *s, VirtIOSCSIReq *req) int target; int ret = 0; - if (s->dataplane_started) { + if (s->dataplane_started && d) { assert(blk_get_aio_context(d->conf.blk) == s->ctx); } /* Here VIRTIO_SCSI_S_OK means "FUNCTION COMPLETE". */ -- 2.3.9