From patchwork Thu Nov 26 14:45:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Eugene \\\"jno\\\" Dvurechenski" X-Patchwork-Id: 549197 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BCE131402C0 for ; Fri, 27 Nov 2015 04:01:24 +1100 (AEDT) Received: from localhost ([::1]:52357 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1zv8-0007Qb-MD for incoming@patchwork.ozlabs.org; Thu, 26 Nov 2015 12:01:22 -0500 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 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp16.uk.ibm.com (192.168.101.146) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 26 Nov 2015 14:45:43 -0000 X-IBM-Helo: d06dlp02.portsmouth.uk.ibm.com X-IBM-MailFrom: jno@linux.vnet.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org;qemu-stable@nongnu.org Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 406ED219005F; Thu, 26 Nov 2015 14:45:37 +0000 (GMT) Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tAQEjhGp48496822; Thu, 26 Nov 2015 14:45:43 GMT Received: from d06av03.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tAQEjgsd002808; Thu, 26 Nov 2015 07:45:43 -0700 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id tAQEjeBL002750; Thu, 26 Nov 2015 07:45:42 -0700 From: "Eugene (jno) Dvurechenski" To: qemu-devel@nongnu.org Date: Thu, 26 Nov 2015 15:45:35 +0100 Message-Id: <1448549135-6582-2-git-send-email-jno@linux.vnet.ibm.com> X-Mailer: git-send-email 2.3.9 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> Organization: zLinux X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15112614-0025-0000-0000-000007EF1A5A X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.112 X-Mailman-Approved-At: Thu, 26 Nov 2015 12:00:20 -0500 Cc: Cornelia Huck , Paolo Bonzini , qemu-stable@nongnu.org, "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH v1 1/1] (for-2.5) virtio-scsi: don't crash without a valid device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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". */