From nobody Sun May 19 05:51:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1594972131; cv=none; d=zohomail.com; s=zohoarc; b=d/cSNNlle6lNeEDAU5/ZzbADCuxaTiBPsK1UoXlvFCimV16fc6IDWBawq3KTxiHvEtweldbYc2zGMhUllFZyweTE8N32wX2GwbXtUbrX1QEsed31+7V3rGTBZKcXjAEcF7ib6GLOgPQt1MlzLcEQcfZgIjiiy+772Hjsf6dm/5Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594972131; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=skCwKeZ+Ncg2xvtkxIFApeepGtPcjDo6Fl40jBauH7g=; b=lOVQDqJiU7PKNs3/rrRfJHCBO+WaOzjqsbOu3GqcPLq5wFMzWA2UdKfbPdseCNX6mZKq4/DYS2qWTyYEUP2C1YDhY8ty4IYw0flgj85otAhvVhuPXl1YUZlp0nLZURo6/QBEi5PNBBhsMHj+u+viMLU9TikLLUgCZwFO5l6qLXk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594972131286775.4653276688548; Fri, 17 Jul 2020 00:48:51 -0700 (PDT) Received: from localhost ([::1]:38320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwL6v-0004kp-2k for importer@patchew.org; Fri, 17 Jul 2020 03:48:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jwL62-0004EI-Vb; Fri, 17 Jul 2020 03:47:55 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:37689) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jwL61-0002WT-DF; Fri, 17 Jul 2020 03:47:54 -0400 Received: by mail-ej1-x641.google.com with SMTP id lx13so9801639ejb.4; Fri, 17 Jul 2020 00:47:52 -0700 (PDT) Received: from x1w.redhat.com (138.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.138]) by smtp.gmail.com with ESMTPSA id c10sm7634322edt.22.2020.07.17.00.47.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 00:47:50 -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:mime-version :content-transfer-encoding; bh=skCwKeZ+Ncg2xvtkxIFApeepGtPcjDo6Fl40jBauH7g=; b=KcPwEcTDR9Ao+QY/V2swjbCA0q14ZPjkBZmaWXHvAsc+wotdxJ7CYhT7yWaAhJTD1t zFZg0Zz98gIyQiDxsVdfAdFCtGo+GkIhblqlaoPpjLuCJwKmHcN4hmDJv0v1/5T1PEtW wVxSDu7QVbOiIyPMHoMMEfBkces7l4YamBJVK5hyHafCUxT1AMcOSPhIBIHca8k+vu+R a+SavAkWc0Y5rF8XIraFkr2tNHnGrcYIguDeioC+p5SN26dH6f2FXc+aeY8rCxrkSwvY FwDKCcmYv/lbjHBSPHRdTOmUBtLGsSpF7ldE25RsOEI5QU1sWDZv4ELqk5UNYhGY9s6m t0kA== 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 :mime-version:content-transfer-encoding; bh=skCwKeZ+Ncg2xvtkxIFApeepGtPcjDo6Fl40jBauH7g=; b=hl+7VA5gY4W0UPDX9EVThCnzhWH4vhIZTwN61r+YTb2XcRrrEz2Aan3LnDrZofPxeP EFbqOdwTC5cUJ/tqE4YJbY9WM3CApDLehQWaiuclzyOL6+M8zvFMp7UmYxGu33BbQVEN sMx5/LFqX/msXX7UREItG73esDOa8ed0HTVsK6kp+bctS4E7Taa2jXVFP/GpHOtfi1WX RyRAJBwkh3c+PKi03tVjFv449v4moB/6Ghyhy/WUZcqVXKEZ+PoZsbSeBuOmVIk049wP MP5iEduirIZqfMuAXGVk4y6FUdtOvv/l764d+BdKDmfteUyuun4Z/ICAujPpVM3XfA// 6nRQ== X-Gm-Message-State: AOAM530iYw6KnaAGtNmYIklJ8gAlI7fvYRF0SpnyJCJB/yvPKDD+F7OY xGOen7rHdI1PXCCR4wTJs5ituDfmcr8= X-Google-Smtp-Source: ABdhPJzWKe1XPkKLnSX/V9YdtPeAawcxBPktS+WaXcie9HTFpMTQIxQ+mun4xwApaM5A9mW8osIdSg== X-Received: by 2002:a17:906:f202:: with SMTP id gt2mr7336087ejb.70.1594972070932; Fri, 17 Jul 2020 00:47:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH-for-5.1] hw/ide: Cancel pending DMA requests before setting as inactive Date: Fri, 17 Jul 2020 09:47:48 +0200 Message-Id: <20200717074748.2528-1-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::641; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x641.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Bulekov , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) libFuzzer found a case where requests are queued for later in the AIO context, but a command set the bus inactive, then when finally the requests are processed by the DMA it aborts because it is inactive: include/hw/ide/pci.h:59: IDEState *bmdma_active_if(BMDMAState *): Assertio= n `bmdma->bus->retry_unit !=3D (uint8_t)-1' failed. Reproducer available on the BugLink. Fix by draining the pending DMA requests before inactivating the bus. BugLink: https://bugs.launchpad.net/qemu/+bug/1887303 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- RFC because I don't have much clue about block drive and IDE, so block-team please be very careful while reviewing this bug. --- hw/ide/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index d997a78e47..b21d28f99c 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -804,11 +804,11 @@ void dma_buf_commit(IDEState *s, uint32_t tx_bytes) =20 void ide_set_inactive(IDEState *s, bool more) { - s->bus->dma->aiocb =3D NULL; - ide_clear_retry(s); if (s->bus->dma->ops->set_inactive) { s->bus->dma->ops->set_inactive(s->bus->dma, more); } + ide_cancel_dma_sync(s); + ide_clear_retry(s); ide_cmd_done(s); } =20 --=20 2.21.3