From nobody Mon Feb 9 17:36:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552325691103572.3827350567487; Mon, 11 Mar 2019 10:34:51 -0700 (PDT) Received: from localhost ([127.0.0.1]:37369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3Oox-0005GN-IV for importer@patchew.org; Mon, 11 Mar 2019 13:34:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3ODc-00077z-1b for qemu-devel@nongnu.org; Mon, 11 Mar 2019 12:56:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3ODa-0003G1-Ng for qemu-devel@nongnu.org; Mon, 11 Mar 2019 12:56:03 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:41570) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3ODa-0003Cs-FH for qemu-devel@nongnu.org; Mon, 11 Mar 2019 12:56:02 -0400 Received: by mail-wr1-x432.google.com with SMTP id p1so1443270wrs.8 for ; Mon, 11 Mar 2019 09:56:02 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id e12sm6484836wrs.91.2019.03.11.09.56.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Mar 2019 09:56:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=rNbPQl/4UypgmmLWc5VlRaP5gdCkG3GIJuH7uo4XxeA=; b=mnSP/hyFxHsxVjpiKSZ34K9bYbV19wpQ6fjHxR6g5PIqEPPRdieJ6NQ0s2LHEJP06D y1lefoXVNxuIGtKmTqLSas8yy5zRWvxeCBmxu78dXxPXdbd/fKeEoNBK9/kQS8ONlWvr OzXwASuYq0fpJxfzp3VurfH/Kwqn9WDYUJRBCRq8wcpmbFywoRU3Xji2VU/fqYSWRFr+ B2zftQTpZVy0R35o4Q7aWSZzwZCensXMEjH+hul43IMeNKvS/lLsmOy4E5zJigZC8wK0 w8z7dbkQ4xlaoSGa/0raotDE3dUlFmlD+CHccA/0it/egPtSxNpISmTseFFftJqsoN/R 3BLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=rNbPQl/4UypgmmLWc5VlRaP5gdCkG3GIJuH7uo4XxeA=; b=T0D/cpXamNk8vIttXYoCoG1tWCa01jTAmHyi7LwVKDENKtmFxdXdxAWmPoEuStWCYL kR8SuD/xu4QXP7uQrM7neH4rymMpvInfx044alIC+BmKmSzPRS6yJp+KGM5MOchvm81l 5lLbI49XcgyS/ca6nPhdc6kwITFkapIZfHFB1bQkV96gOEgNjetNQk3972NpzBGwjL9t tp8dFVojEmYe3rvXj4QeC+4VbNhjbI6xBCTPCDqQu4GGPfw5An6KHVRyMgRluSp/hFnU Q2kqsCftoLVkOd7EUatDqdail4tot6D7UK4PGKtf3UEa5wDOd3vFdh/UsaTRhEDjuutj ZwcQ== X-Gm-Message-State: APjAAAWfByi52D5hJ9NB0yLwAWSp6GXdHxcofHOLKh2k/q1R85dOhOKr chjBotp+HadB1LwoImRToRDSB8hz X-Google-Smtp-Source: APXvYqx8k/foW3SGB6XHomqYZx7523jibvmefVt3p3oHTYh1RsWb8RIJWb0TKN8ims6xpUfxt5adSw== X-Received: by 2002:adf:f690:: with SMTP id v16mr21368188wrp.139.1552323361168; Mon, 11 Mar 2019 09:56:01 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 17:55:25 +0100 Message-Id: <1552323335-46779-22-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1552323335-46779-1-git-send-email-pbonzini@redhat.com> References: <1552323335-46779-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 Subject: [Qemu-devel] [PULL v2 21/31] scsi-disk: Fix crash if request is invaild or disk is no medium X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhengui Li Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Zhengui Li Qemu will crash with the assertion error that "assert(r->req.aiocb !=3D NULL)" in scsi_read_complete if request is invaild or disk is no medium. The error is below: qemu-kvm: hw/scsi/scsi_disk.c:299: scsi_read_complete: Assertion `r->req.aiocb !=3D NULL' failed. This patch add a funtion scsi_read_complete_noio to fix it. Signed-off-by: Zhengui Li Message-Id: <1551949966-20092-1-git-send-email-lizhengui@huawei.com> Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index d4e83ae..e7e865a 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -296,22 +296,15 @@ static void scsi_dma_complete(void *opaque, int ret) aio_context_release(blk_get_aio_context(s->qdev.conf.blk)); } =20 -static void scsi_read_complete(void * opaque, int ret) +static void scsi_read_complete_noio(SCSIDiskReq *r, int ret) { - SCSIDiskReq *r =3D (SCSIDiskReq *)opaque; - SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, r->req.dev); - int n; + uint32_t n; =20 - assert(r->req.aiocb !=3D NULL); - r->req.aiocb =3D NULL; - aio_context_acquire(blk_get_aio_context(s->qdev.conf.blk)); - if (scsi_disk_req_check_error(r, ret, true)) { + assert(r->req.aiocb =3D=3D NULL); + if (scsi_disk_req_check_error(r, ret, false)) { goto done; } =20 - block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct); - trace_scsi_disk_read_complete(r->req.tag, r->qiov.size); - n =3D r->qiov.size / 512; r->sector +=3D n; r->sector_count -=3D n; @@ -319,6 +312,24 @@ static void scsi_read_complete(void * opaque, int ret) =20 done: scsi_req_unref(&r->req); +} + +static void scsi_read_complete(void *opaque, int ret) +{ + SCSIDiskReq *r =3D (SCSIDiskReq *)opaque; + SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, r->req.dev); + + assert(r->req.aiocb !=3D NULL); + r->req.aiocb =3D NULL; + + aio_context_acquire(blk_get_aio_context(s->qdev.conf.blk)); + if (ret < 0) { + block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct); + } else { + block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct); + trace_scsi_disk_read_complete(r->req.tag, r->qiov.size); + } + scsi_read_complete_noio(r, ret); aio_context_release(blk_get_aio_context(s->qdev.conf.blk)); } =20 @@ -395,12 +406,12 @@ static void scsi_read_data(SCSIRequest *req) scsi_req_ref(&r->req); if (r->req.cmd.mode =3D=3D SCSI_XFER_TO_DEV) { trace_scsi_disk_read_data_invalid(); - scsi_read_complete(r, -EINVAL); + scsi_read_complete_noio(r, -EINVAL); return; } =20 if (!blk_is_available(req->dev->conf.blk)) { - scsi_read_complete(r, -ENOMEDIUM); + scsi_read_complete_noio(r, -ENOMEDIUM); return; } =20 --=20 1.8.3.1