From nobody Tue Nov 18 22:39:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613402369005874.6806090003238; Mon, 15 Feb 2021 07:19:29 -0800 (PST) Received: from localhost ([::1]:51590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBfep-0007SO-UA for importer@patchew.org; Mon, 15 Feb 2021 10:19:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBfXE-0007l2-NQ; Mon, 15 Feb 2021 10:11:37 -0500 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]:34754) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lBfXC-0004xZ-TF; Mon, 15 Feb 2021 10:11:36 -0500 Received: by mail-ej1-x62a.google.com with SMTP id hs11so11722586ejc.1; Mon, 15 Feb 2021 07:11:33 -0800 (PST) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id gz14sm10813069ejc.105.2021.02.15.07.11.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Feb 2021 07:11:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0Foot1z/bPEvPG+tsO1eP+dD8uRiPKW3JSFYgR5OC24=; b=cOsVRIs5QZ2JprVNeI3CiBSGWt2excuyYwid+JuLobLC4bIabAEKfIkRW10DOI7xgR gxwSJmLmqbZTGrkDLrfphUWFepmdtQOdtC6oT8RPxeIPwqsKxh5aiM3jtgMqK2jrY5u2 NYyV5IyEgMTEyD8G/BcsgrgB26x/gZ1PpE0AvxqZKIpC0s7MHf+wz9XV1N74xR1aGNxQ 9dNUkzPqGdFX1Yc8v2TPWtbA5IwhMtiT2ekLfezOs8ImM0vwrncj0b2K8Fu1rCxENijI rkgQ1ZHoLw2jO6jafw3DWt/ocOM1H0R9XFzAmiI5pkw2KvEwOZoSDGwJOcp2Pilli3Mh +7aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0Foot1z/bPEvPG+tsO1eP+dD8uRiPKW3JSFYgR5OC24=; b=Ur/4XRDq4/aG2KdfnR8ZsGTVYQY+njgHKeFlDjnN6ksWRev79obUxQ78WuuUC294Q2 BcBQqYER3bKKtYSJmD7L5/8h88Xr7lRKVMGD2mZlXhvvKxeG3y6V2KBM0QtUPeGTJVdQ 6gLzBsDg+wAe7PGmCLzclJGQONdAc0O5dwx0IdHjHW/jMr8AVog4ow2dYd4YPMKVHxFJ wCIpag6ZqGdYlwK7owRn4EM8KZ2tO6vbsjqCueNc0KEjArdALedjjsbNp3wvTa4qv3q7 X48EklfNq7mW2ty9T1BAauMi8E7y26WgUVIyvC2ZptFgwLW0a2qUWjnSTeRTOrjKj4Vt 8d4A== X-Gm-Message-State: AOAM531HHhIn86vgA7L2Mk44HA7vdvgpW6eZrvLXvx3Y4uSHMN1c3A1F SdIeIRC4jEOXQrq4+isvG2xN8u/3exo= X-Google-Smtp-Source: ABdhPJzsw54s816+j79lFL/zuuuuMVRE+oB2mseU2IeuWo+j7Vog57vAPx96fFEHeVbdMtEu8fDNDQ== X-Received: by 2002:a17:906:c08a:: with SMTP id f10mr16130711ejz.52.1613401892962; Mon, 15 Feb 2021 07:11:32 -0800 (PST) From: Bin Meng To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mauro Matteo Cascella , Li Qiang , Alexander Bulekov , Alistair Francis , Prasad J Pandit , Bandan Das Subject: [PATCH 1/4] hw/sd: sdhci: Don't transfer any data when command time out Date: Mon, 15 Feb 2021 23:11:08 +0800 Message-Id: <1613401871-59515-2-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1613401871-59515-1-git-send-email-bmeng.cn@gmail.com> References: <1613401871-59515-1-git-send-email-bmeng.cn@gmail.com> MIME-Version: 1.0 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::62a; envelope-from=bmeng.cn@gmail.com; helo=mail-ej1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: qemu-stable@nongnu.org, qemu-block@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) At the end of sdhci_send_command(), it starts a data transfer if the command register indicates data is associated. But the data transfer should only be initiated when the command execution has succeeded. With this fix, the following reproducer: outl 0xcf8 0x80001810 outl 0xcfc 0xe1068000 outl 0xcf8 0x80001804 outw 0xcfc 0x7 write 0xe106802c 0x1 0x0f write 0xe1068004 0xc 0x2801d10101fffffbff28a384 write 0xe106800c 0x1f 0x9dacbbcad9e8f7061524334251606f7e8d9cabbac9d8e7f6051= 4233241505f write 0xe1068003 0x28 0x80d000251480d000252280d000253080d000253e80d000254c8= 0d000255a80d000256880d0002576 write 0xe1068003 0x1 0xfe cannot be reproduced with the following QEMU command line: $ qemu-system-x86_64 -nographic -M pc-q35-5.0 \ -device sdhci-pci,sd-spec-version=3D3 \ -drive if=3Dsd,index=3D0,file=3Dnull-co://,format=3Draw,id=3Dmydrive \ -device sd-card,drive=3Dmydrive \ -monitor none -serial none -qtest stdio Cc: qemu-stable@nongnu.org Fixes: CVE-2020-17380 Fixes: CVE-2020-25085 Fixes: CVE-2021-3409 Fixes: d7dfca0807a0 ("hw/sdhci: introduce standard SD host controller") Reported-by: Alexander Bulekov Reported-by: Cornelius Aschermann (Ruhr-University Bochum) Reported-by: Muhammad Ramdhan Reported-by: Sergej Schumilo (Ruhr-University Bochum) Reported-by: Simon Wrner (Ruhr-University Bochum) Buglink: https://bugs.launchpad.net/qemu/+bug/1892960 Buglink: https://bugs.launchpad.net/qemu/+bug/1909418 Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D1928146 Signed-off-by: Bin Meng Acked-by: Alistair Francis Tested-by: Alexander Bulekov Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdhci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 8ffa539..1c5ab26 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -326,6 +326,7 @@ static void sdhci_send_command(SDHCIState *s) SDRequest request; uint8_t response[16]; int rlen; + bool timeout =3D false; =20 s->errintsts =3D 0; s->acmd12errsts =3D 0; @@ -349,6 +350,7 @@ static void sdhci_send_command(SDHCIState *s) trace_sdhci_response16(s->rspreg[3], s->rspreg[2], s->rspreg[1], s->rspreg[0]); } else { + timeout =3D true; trace_sdhci_error("timeout waiting for command response"); if (s->errintstsen & SDHC_EISEN_CMDTIMEOUT) { s->errintsts |=3D SDHC_EIS_CMDTIMEOUT; @@ -369,7 +371,7 @@ static void sdhci_send_command(SDHCIState *s) =20 sdhci_update_irq(s); =20 - if (s->blksize && (s->cmdreg & SDHC_CMD_DATA_PRESENT)) { + if (!timeout && s->blksize && (s->cmdreg & SDHC_CMD_DATA_PRESENT)) { s->data_count =3D 0; sdhci_data_transfer(s); } --=20 2.7.4 From nobody Tue Nov 18 22:39:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613402129; cv=none; d=zohomail.com; s=zohoarc; b=hnM4sHD4JvXYQE9e7ceF5Yk0jobczYgd7w/dIONhgMdYijm32az+bFPRBRco4Bjp+kE1gJDYNztaTj/IZ+r9n5JjrbToOjY8Vv4hJT0Z1NdP155BiAmbyNrN1cQ4V0g9m6RPdiGAXXjERgnsFurtiSK/ZR/6bJq2CImg54gDgnc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613402129; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=H2L8unWUlArPw7R/5bRhRpbQDhA50JONh9WRib1752Y=; b=HhVBvwpdCYbC7h8Y10IzdZ81yG4XYGYcoCBpgdk9A/rnifCwecS1GpWlODpaXDN2gEDIgpcF2PqaWmhDePUphDY5fokmoP5v2KfQU0m4iBbcHz6J1wQC1xpZ+kKi8GcOk2tSKAYJuQifwPDpFGLXd8MvgTB6P7+4tRCt5kjpBJw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1613402128900398.7245578876963; Mon, 15 Feb 2021 07:15:28 -0800 (PST) Received: from localhost ([::1]:43760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBfav-00046T-Eo for importer@patchew.org; Mon, 15 Feb 2021 10:15:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58342) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBfXM-0007nM-5j; Mon, 15 Feb 2021 10:11:45 -0500 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]:34662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lBfXI-00050E-S6; Mon, 15 Feb 2021 10:11:43 -0500 Received: by mail-ed1-x52e.google.com with SMTP id df22so8506800edb.1; Mon, 15 Feb 2021 07:11:39 -0800 (PST) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id gz14sm10813069ejc.105.2021.02.15.07.11.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Feb 2021 07:11:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=H2L8unWUlArPw7R/5bRhRpbQDhA50JONh9WRib1752Y=; b=lvyPJw1Pat1C2EwVjY+MsFATiTwx+G0mLcX/13ynnjiV8JRPs7WrXTgBTxA5Ytg29V JLvhZW4kFlXmfn2IP9Nkq6IfrIp2iT/e7KZh0n6WCklUhur4A5TalMqXfOwLiYkKo89A 8mHZNEwaG2vGPw+8NlPk1Gvj5nUQZDRsLpW7PtqU6ECl1jpBFDEJhGKxAH6kuG/P7lUj WOERulNZEjg6DWgn6FGOlgdVUW4wUktPZSE31J6Ny5sHTj80fvOxUtdKVeSK3jbUGviw GUJ9R045n9nGTsX5jRBkCdDvRDjqa/85gUVUF+n2LBWuRbB73a0rKah3QV7E0niEjWF4 budQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=H2L8unWUlArPw7R/5bRhRpbQDhA50JONh9WRib1752Y=; b=qcK3SxIyV6b1HFjYRqGQSm9RyY4FN3uj/jV4mgqGqBmZiqvms5TabwpLIL64VJAzhF Bb+r9I2UVmOFFittMvn/oyLCQHzHZ7CcurzwyxSqaAuiauzB7V7rsMKjf5DzX54B+7Xu Tm327ZKZUkQwLOLlkQsICmxVzat7W76J3fvcxup/1k5DZcpznp3WQf40PgSzDgR2L6Td xRxjQc8/xGpjULb4mRNRkLLPoxOjwzXe3nu8xl9pQme+746xP0BOamjgndmXkliMuveh mIbYsyJJ8wog7DnwyZvVohyA756+RZqLtyst20v3IoxDZFPshl90oPSl6WHSxiSgHlGA yF7Q== X-Gm-Message-State: AOAM531c56K2pFg3mvjCUR611z565CKndUOivOBO8EYeRZX01SmS+ALU ULBqzgOB04L0N/+JOUtf5qXcgyDWpkY= X-Google-Smtp-Source: ABdhPJy11EPXWff25kIje7TEFOyHCm/KL3NXUL+7UmL9EJ5gP1cDlKgY6Uj0pvlv3iI+EMp2/j63hQ== X-Received: by 2002:a05:6402:3508:: with SMTP id b8mr16083634edd.341.1613401898759; Mon, 15 Feb 2021 07:11:38 -0800 (PST) From: Bin Meng To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mauro Matteo Cascella , Li Qiang , Alexander Bulekov , Alistair Francis , Prasad J Pandit , Bandan Das Subject: [PATCH 2/4] hw/sd: sdhci: Don't write to SDHC_SYSAD register when transfer is in progress Date: Mon, 15 Feb 2021 23:11:09 +0800 Message-Id: <1613401871-59515-3-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1613401871-59515-1-git-send-email-bmeng.cn@gmail.com> References: <1613401871-59515-1-git-send-email-bmeng.cn@gmail.com> 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::52e; envelope-from=bmeng.cn@gmail.com; helo=mail-ed1-x52e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: qemu-stable@nongnu.org, qemu-block@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Per "SD Host Controller Standard Specification Version 7.00" chapter 2.2.1 SDMA System Address Register: This register can be accessed only if no transaction is executing (i.e., after a transaction has stopped). With this fix, the following reproducer: https://paste.debian.net/plain/1185137 cannot be reproduced with the following QEMU command line: $ qemu-system-x86_64 -nographic -machine accel=3Dqtest -m 512M \ -nodefaults -device sdhci-pci,sd-spec-version=3D3 \ -drive if=3Dsd,index=3D0,file=3Dnull-co://,format=3Draw,id=3Dmydrive= \ -device sd-card,drive=3Dmydrive -qtest stdio Cc: qemu-stable@nongnu.org Fixes: CVE-2020-17380 Fixes: CVE-2020-25085 Fixes: CVE-2021-3409 Fixes: d7dfca0807a0 ("hw/sdhci: introduce standard SD host controller") Reported-by: Alexander Bulekov Reported-by: Cornelius Aschermann (Ruhr-University Bochum) Reported-by: Muhammad Ramdhan Reported-by: Sergej Schumilo (Ruhr-University Bochum) Reported-by: Simon Wrner (Ruhr-University Bochum) Buglink: https://bugs.launchpad.net/qemu/+bug/1892960 Buglink: https://bugs.launchpad.net/qemu/+bug/1909418 Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D1928146 Signed-off-by: Bin Meng --- hw/sd/sdhci.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 1c5ab26..05cb281 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1122,15 +1122,17 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t v= al, unsigned size) =20 switch (offset & ~0x3) { case SDHC_SYSAD: - s->sdmasysad =3D (s->sdmasysad & mask) | value; - MASKED_WRITE(s->sdmasysad, mask, value); - /* Writing to last byte of sdmasysad might trigger transfer */ - if (!(mask & 0xFF000000) && TRANSFERRING_DATA(s->prnsts) && s->blk= cnt && - s->blksize && SDHC_DMA_TYPE(s->hostctl1) =3D=3D SDHC_CTRL_= SDMA) { - if (s->trnmod & SDHC_TRNS_MULTI) { - sdhci_sdma_transfer_multi_blocks(s); - } else { - sdhci_sdma_transfer_single_block(s); + if (!TRANSFERRING_DATA(s->prnsts)) { + s->sdmasysad =3D (s->sdmasysad & mask) | value; + MASKED_WRITE(s->sdmasysad, mask, value); + /* Writing to last byte of sdmasysad might trigger transfer */ + if (!(mask & 0xFF000000) && s->blkcnt && s->blksize && + SDHC_DMA_TYPE(s->hostctl1) =3D=3D SDHC_CTRL_SDMA) { + if (s->trnmod & SDHC_TRNS_MULTI) { + sdhci_sdma_transfer_multi_blocks(s); + } else { + sdhci_sdma_transfer_single_block(s); + } } } break; --=20 2.7.4 From nobody Tue Nov 18 22:39:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613402564; cv=none; d=zohomail.com; s=zohoarc; b=aGKeXAp7Pr9ZA/178oxUfq49y4rtlT/u/oULtiJXkuvTe2Vl9ISgiKvHgaTB53LC9wvkeKBshJCQgALaWDAIaJD+Y7w/w0drRRrRLfjkmuWr5SbHnpwYmzJYmDfmQo7KqmSdtVpgeIk159CcFsgGfseRmUYb3VjMnRU8Zm3kNgY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613402564; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=GmPOyYhtMaQGLeUL8TQFwbbYMxSl6yrfYp58gXklU0I=; b=lcZbRBa96JoZa4x7BcXiLMJmW2pSWU5NYKBuP1a8si7NLd8h86H+dvTI6zWpIV/YpCoXxwwSr0V9G8ANEESzTatrwYatG639nQW0oSDl1898W0DkgD9bKseuqcpDhHVdLpKUeRepdiH/KWihfWW690q1tQJzRY3PXswi5BnMnPE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1613402563909512.2587551073922; Mon, 15 Feb 2021 07:22:43 -0800 (PST) Received: from localhost ([::1]:58038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBfhy-0001lI-SB for importer@patchew.org; Mon, 15 Feb 2021 10:22:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBfXV-0007pT-E0; Mon, 15 Feb 2021 10:11:55 -0500 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]:46999) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lBfXO-00052o-Rf; Mon, 15 Feb 2021 10:11:51 -0500 Received: by mail-ed1-x531.google.com with SMTP id y18so8375235edw.13; Mon, 15 Feb 2021 07:11:45 -0800 (PST) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id gz14sm10813069ejc.105.2021.02.15.07.11.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Feb 2021 07:11:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GmPOyYhtMaQGLeUL8TQFwbbYMxSl6yrfYp58gXklU0I=; b=s4JR5BmoowEqqMVFLip4nIYyDaZKMRVik7N0t3KXRPEdAMrFj8/SQXUFxtNn+er6St kGmVoSbKhdcieRYUakZeaJzZonKdsBbrXE+caSjgHkNPQq0PD5U7kImHAY96aIeLgFT9 jAoOMBovgpaRGAD9j2bOejrPD1SrSNOmlqGxWF2BKMMpGIGpNwr2Cd6V3I23UIm3ZVWc 9u3AS7+5I8ljiJvn4QjyEvrVRb3xfTstRcVje0+lqpQg2SMYfy48iCHT1qVF3e5Yjgxg tfOeEWAYtLk3rzQrNbcRAxLpPpxdvft1sGL1dXqeWd4Ugya63qqhb2cTGHWtnOjecF64 6cHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GmPOyYhtMaQGLeUL8TQFwbbYMxSl6yrfYp58gXklU0I=; b=eDesSu3goy9sEt5tkVS6grrIpjI0XSguK11MASCS5WgO+uyrhMZ4VQmed2uNL6JzT9 DUxhU2IP9FcdBpa2d+BXEsreC13zZW6VAGtVxQJ/DcKKibrO/+EE3i/UdnoOr2SUxmiI 1cpN1rTG2hhcY2TLwtY24OmlwWpRO1rRar3Ovtylp3M63uExpL9/nWwWgC+wXJiiVr0l KRHXfmhhTitQ5j55MIW9SZSJYlokHbC+QD2Qu9pVaFV11A7h89M+He7Edu0zNNuukOrr gWqH28qj5rSk3fCHd2t+6Ev00ffkXWXNjVfmKHRzKZka/RBY2WxwCQLdCb/uOK8+0vL0 Rq1g== X-Gm-Message-State: AOAM530MvnnvcjJiwoSY8tVEO2Gn0ZE1SQBQRKMu+AXebj/n76jmSAxD 8MLNJEEZbfr1ZczPJj2+WJM= X-Google-Smtp-Source: ABdhPJwja0kpqBJljvb3c+czPkWdLYxSFunQypCmncNOZdrpGcHkZhc18T3tW5UclPDovrnF1AdEHA== X-Received: by 2002:aa7:d50b:: with SMTP id y11mr3685180edq.288.1613401904823; Mon, 15 Feb 2021 07:11:44 -0800 (PST) From: Bin Meng To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mauro Matteo Cascella , Li Qiang , Alexander Bulekov , Alistair Francis , Prasad J Pandit , Bandan Das Subject: [PATCH 3/4] hw/sd: sdhci: Correctly set the controller status for ADMA Date: Mon, 15 Feb 2021 23:11:10 +0800 Message-Id: <1613401871-59515-4-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1613401871-59515-1-git-send-email-bmeng.cn@gmail.com> References: <1613401871-59515-1-git-send-email-bmeng.cn@gmail.com> 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::531; envelope-from=bmeng.cn@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: qemu-stable@nongnu.org, qemu-block@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When an ADMA transfer is started, the codes forget to set the controller status to indicate a transfer is in progress. With this fix, the following 2 reproducers: https://paste.debian.net/plain/1185136 https://paste.debian.net/plain/1185141 cannot be reproduced with the following QEMU command line: $ qemu-system-x86_64 -nographic -machine accel=3Dqtest -m 512M \ -nodefaults -device sdhci-pci,sd-spec-version=3D3 \ -drive if=3Dsd,index=3D0,file=3Dnull-co://,format=3Draw,id=3Dmydrive \ -device sd-card,drive=3Dmydrive -qtest stdio Cc: qemu-stable@nongnu.org Fixes: CVE-2020-17380 Fixes: CVE-2020-25085 Fixes: CVE-2021-3409 Fixes: d7dfca0807a0 ("hw/sdhci: introduce standard SD host controller") Reported-by: Alexander Bulekov Reported-by: Cornelius Aschermann (Ruhr-University Bochum) Reported-by: Muhammad Ramdhan Reported-by: Sergej Schumilo (Ruhr-University Bochum) Reported-by: Simon Wrner (Ruhr-University Bochum) Buglink: https://bugs.launchpad.net/qemu/+bug/1892960 Buglink: https://bugs.launchpad.net/qemu/+bug/1909418 Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D1928146 Signed-off-by: Bin Meng --- hw/sd/sdhci.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 05cb281..0b0ca6f 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -769,7 +769,9 @@ static void sdhci_do_adma(SDHCIState *s) =20 switch (dscr.attr & SDHC_ADMA_ATTR_ACT_MASK) { case SDHC_ADMA_ATTR_ACT_TRAN: /* data transfer */ + s->prnsts |=3D SDHC_DATA_INHIBIT | SDHC_DAT_LINE_ACTIVE; if (s->trnmod & SDHC_TRNS_READ) { + s->prnsts |=3D SDHC_DOING_READ; while (length) { if (s->data_count =3D=3D 0) { sdbus_read_data(&s->sdbus, s->fifo_buffer, block_s= ize); @@ -797,6 +799,7 @@ static void sdhci_do_adma(SDHCIState *s) } } } else { + s->prnsts |=3D SDHC_DOING_WRITE; while (length) { begin =3D s->data_count; if ((length + begin) < block_size) { --=20 2.7.4 From nobody Tue Nov 18 22:39:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613402697333397.61952848684734; Mon, 15 Feb 2021 07:24:57 -0800 (PST) Received: from localhost ([::1]:33546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBfk7-0003K1-6s for importer@patchew.org; Mon, 15 Feb 2021 10:24:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58378) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBfXX-0007pm-8g; Mon, 15 Feb 2021 10:11:55 -0500 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]:40297) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lBfXU-00054T-Mu; Mon, 15 Feb 2021 10:11:54 -0500 Received: by mail-ed1-x531.google.com with SMTP id q10so8436129edt.7; Mon, 15 Feb 2021 07:11:51 -0800 (PST) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id gz14sm10813069ejc.105.2021.02.15.07.11.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Feb 2021 07:11:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j74hA88dQlRT5h9AyzKihyhf2yOb2rwfrpA+aown/fQ=; b=pX/D1UpnbROkcbZ+6nMOZCkZdkAS1JKk0Z6OrMn04DUGxJVgRY+/iDD17vjqq6j3zJ g2LStGj5MvoJn5d21+LtfZqz0g4Tk12UjccO+luccMjm4FfXVtONXrmhrG5Y2lle/7gP iC+Bsrp+fROpmtneE0+7fv7Wmg2XTWU3sTrv/8ZwDeFjAfvzBcvdPfwq5UedV9x+F0ZU BsUISc8y3AbNyJ8SdNGCijNp3uBMuifwB/Az61MZven18v7nRdm2S2OXBQ3x3TeCuKlb iEhQAJj/jRW6ATLtht914iBXJ/S4zk2raeYwE33+avGNXZ8GiJV0K204KNrNBTPcOL+4 thZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j74hA88dQlRT5h9AyzKihyhf2yOb2rwfrpA+aown/fQ=; b=kbK1XazvAoJh9Gli2lfXG5pqOoDlzRNZazCGSmz+ZDrZYm8jb55putOX8diUOojwpo onC9CVJeqvmopMMG2CwxwsJO6SVH2QyMG16lLY2A8b0GFrAbK/aA8kGWlK7XEUwXr3+W SAhlZq1m2EEJqchvGQRrMrj+AHdatwHMHqUqvsMIh5u58vubWhS2g5JHQO8uRJWeqRZv Z5WnD2SnERS+BxGciwUyBe3nbFEoUfu38b77v+GH3a8lp0KprNGAGNtPtduh2vyhh1C5 pq/e3FO977Rw8FhRFjdy60jL3GjhYyVCk/6/1WG0HnrzEHEVf/wzrKggkyarAyNS325Z tl3Q== X-Gm-Message-State: AOAM532X9jfNSLK8TnPkKNj+8xg45rHqK2QDC4n8Sq2EzeHWEPkK1RO5 RJPOOtL1Fd+Gcqupby6loDg= X-Google-Smtp-Source: ABdhPJz+WqQY/h9plbR6IjZ+cSKSI01SM8svwIS2BvGf3C+YpBJcKJESorEfVZrBksnje41GeK6EkQ== X-Received: by 2002:a05:6402:17e2:: with SMTP id t2mr16061759edy.140.1613401910645; Mon, 15 Feb 2021 07:11:50 -0800 (PST) From: Bin Meng To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mauro Matteo Cascella , Li Qiang , Alexander Bulekov , Alistair Francis , Prasad J Pandit , Bandan Das Subject: [PATCH 4/4] hw/sd: sdhci: Simplify updating s->prnsts in sdhci_sdma_transfer_multi_blocks() Date: Mon, 15 Feb 2021 23:11:11 +0800 Message-Id: <1613401871-59515-5-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1613401871-59515-1-git-send-email-bmeng.cn@gmail.com> References: <1613401871-59515-1-git-send-email-bmeng.cn@gmail.com> MIME-Version: 1.0 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::531; envelope-from=bmeng.cn@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: qemu-stable@nongnu.org, qemu-block@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Type: text/plain; charset="utf-8" s->prnsts is updated in both branches of the if () else () statement. Move the common bits outside so that it is cleaner. Signed-off-by: Bin Meng --- hw/sd/sdhci.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 0b0ca6f..7a2003b 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -598,9 +598,9 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState= *s) page_aligned =3D true; } =20 + s->prnsts |=3D SDHC_DATA_INHIBIT | SDHC_DAT_LINE_ACTIVE; if (s->trnmod & SDHC_TRNS_READ) { - s->prnsts |=3D SDHC_DOING_READ | SDHC_DATA_INHIBIT | - SDHC_DAT_LINE_ACTIVE; + s->prnsts |=3D SDHC_DOING_READ; while (s->blkcnt) { if (s->data_count =3D=3D 0) { sdbus_read_data(&s->sdbus, s->fifo_buffer, block_size); @@ -627,8 +627,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState= *s) } } } else { - s->prnsts |=3D SDHC_DOING_WRITE | SDHC_DATA_INHIBIT | - SDHC_DAT_LINE_ACTIVE; + s->prnsts |=3D SDHC_DOING_WRITE; while (s->blkcnt) { begin =3D s->data_count; if (((boundary_count + begin) < block_size) && page_aligned) { --=20 2.7.4