From patchwork Sat Mar 9 07:48:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 10845855 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 46BCC1390 for ; Sat, 9 Mar 2019 08:11:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36B572E18A for ; Sat, 9 Mar 2019 08:11:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B09E2E194; Sat, 9 Mar 2019 08:11:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8B1642E18A for ; Sat, 9 Mar 2019 08:11:19 +0000 (UTC) Received: from localhost ([127.0.0.1]:55655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2X4g-0005K1-Oo for patchwork-qemu-devel@patchwork.kernel.org; Sat, 09 Mar 2019 03:11:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Wim-0003wM-4u for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2Wil-0000cW-94 for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:40 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:34141) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h2Wil-0000bd-13 for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:39 -0500 Received: by mail-wr1-x42d.google.com with SMTP id f14so23644671wrg.1 for ; Fri, 08 Mar 2019 23:48:38 -0800 (PST) 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=YE3tFBmd6lH8QByi8FFZPTFbCquhfWyhh/TJkC1kLzBSrAA/eF9c7MWkT/757ekLPg SiIwDrSk8HowS6fxmAezAM+mqqrfKStxpWXx548bwPPP2JyOciAUedEJFcQk1/agzov4 cIufsmJAtOijI0sUffBT2/5Bc/FBLBl6umOGueUfagrl1SLDxDqbx1Mq+UstBCjKwQ9O x5xlhE6WWRUSdJmivkL8z37q9p/rD3xDCl0NDAjER7Ja4hZFpxmRD9z2SNjfjgARzeLd juPWwyAx3pUiCWKd+gPLbH22+rN0xRgrqUvrewVxJPvCvK9SpV1IfpddhJ2haVX3/Lla OCgw== 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=qmGXrRlwx9cMrxcM+9VdhGksC68VwYNyr1YTxHbdfiQDaC2teH1QBZmrqXmMdswVM4 /yjm42zfD0aVYrJ6O8DKI9nn17taxHKHKlc49AxbssuZw6YAOt7PyZ7P2cdRL9FrLzlL KEKU4SNk6AnaariAltn1ROJy5JN0fNurzPrCSMQu2nxGaF/Uc8+kyDeWv6Pj9/N/lztN XCxAD71J7rsXdBU+xtdi0j90eEBVVEuNonoDz4LRZS5zUiXLsApYXOiOgZi7gCMVe8or h0dTPgmxhNNnNLLbyNYvs5351WSgFuUhjX5GmQV5VENeVopfrJ9YC1dEgh9IOk0AJ+7/ YzTQ== X-Gm-Message-State: APjAAAUl/PTcZgUikdyCgPXGcJ6UfRCXseLdpsw8jZQ4JEDCKY8oO7W8 6ci3suvp0D73g1SfjrpxIp4j9O90 X-Google-Smtp-Source: APXvYqx5tkzFnDilUSyi6gE3fp9XsUzMT5j9HWrWIast1xSqvi3UeJSd2ZurLCkeDNqfTVkAJUlYyg== X-Received: by 2002:a5d:4b05:: with SMTP id v5mr4478602wrq.323.1552117717678; Fri, 08 Mar 2019 23:48:37 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 11sm5252294wmg.27.2019.03.08.23.48.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 23:48:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 9 Mar 2019 08:48:12 +0100 Message-Id: <1552117698-12355-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1552117698-12355-1-git-send-email-pbonzini@redhat.com> References: <1552117698-12355-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::42d Subject: [Qemu-devel] [PULL 19/25] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Zhengui Li Qemu will crash with the assertion error that "assert(r->req.aiocb != 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 != 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)); } -static void scsi_read_complete(void * opaque, int ret) +static void scsi_read_complete_noio(SCSIDiskReq *r, int ret) { - SCSIDiskReq *r = (SCSIDiskReq *)opaque; - SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); - int n; + uint32_t n; - assert(r->req.aiocb != NULL); - r->req.aiocb = 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 == NULL); + if (scsi_disk_req_check_error(r, ret, false)) { goto done; } - block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct); - trace_scsi_disk_read_complete(r->req.tag, r->qiov.size); - n = r->qiov.size / 512; r->sector += n; r->sector_count -= n; @@ -319,6 +312,24 @@ static void scsi_read_complete(void * opaque, int ret) done: scsi_req_unref(&r->req); +} + +static void scsi_read_complete(void *opaque, int ret) +{ + SCSIDiskReq *r = (SCSIDiskReq *)opaque; + SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); + + assert(r->req.aiocb != NULL); + r->req.aiocb = 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)); } @@ -395,12 +406,12 @@ static void scsi_read_data(SCSIRequest *req) scsi_req_ref(&r->req); if (r->req.cmd.mode == SCSI_XFER_TO_DEV) { trace_scsi_disk_read_data_invalid(); - scsi_read_complete(r, -EINVAL); + scsi_read_complete_noio(r, -EINVAL); return; } if (!blk_is_available(req->dev->conf.blk)) { - scsi_read_complete(r, -ENOMEDIUM); + scsi_read_complete_noio(r, -ENOMEDIUM); return; }