From nobody Fri Dec 19 20:29:30 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1733910755; cv=none; d=zohomail.com; s=zohoarc; b=YMJw2PldK3VbzCbzAdHlkHQlCHq0BhYft4QO7wnisuyQy2V64OyWnknDn7njZAqjp+iTSMlhYz4NN2WH+RhM47+88W224UyQYVt48DOBvWOzJHLbzG53t922Yo2IHfy6kIN2Q+doVx6mZsCw7GdaHHSyFHhVvEg73lYoGx+kjx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1733910755; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=g8t9o+2woOlPJJk/fmFvHHw1V0ybH+1TMUKc0arIes8=; b=cINidRZM+iHMfj3CivwtgQytaKzIgJTyzLECTMKjdPh34Swy4Dqy9+Fy8gzepNxHWRWN8xwyRKWEJ3c6y2iBmAV/WPIvkE91TkPpVKDESPUGPCTmZ/g8BvBU8lmjscjzh0Gvq+zBkLkN5bfIwjcpEIRIV563Seu1kEooT6VdJLI= ARC-Authentication-Results: i=1; mx.zohomail.com; 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1733910755607690.2903622593985; Wed, 11 Dec 2024 01:52:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLJNP-0006A9-G5; Wed, 11 Dec 2024 04:51:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tLJNN-00069a-9L; Wed, 11 Dec 2024 04:51:25 -0500 Received: from mail.aspeedtech.com ([211.20.114.72] helo=TWMBX01.aspeed.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tLJNL-00057d-Oi; Wed, 11 Dec 2024 04:51:25 -0500 Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Wed, 11 Dec 2024 17:51:11 +0800 Received: from localhost.localdomain (192.168.10.10) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Wed, 11 Dec 2024 17:51:11 +0800 To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , "open list:SD (Secure Card)" , "open list:All patches CC here" CC: , , Subject: [RFC.PATCH v1 1/2] sd:sdhci: Fix boundary_count overflow in sdhci_sdma_transfer_multi_blocks Date: Wed, 11 Dec 2024 17:51:09 +0800 Message-ID: <20241211095111.1421928-2-jamin_lin@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241211095111.1421928-1-jamin_lin@aspeedtech.com> References: <20241211095111.1421928-1-jamin_lin@aspeedtech.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=211.20.114.72; envelope-from=jamin_lin@aspeedtech.com; helo=TWMBX01.aspeed.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_FAIL=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jamin Lin From: Jamin Lin via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1733910757463116600 Content-Type: text/plain; charset="utf-8" How to reproduce it: 1. The value of "s->blksie" was 0x7200. The bits[14:12] was "111", so the b= uffer boundary was 0x80000.(512Kbytes). This SDMA buffer boundary the same as u-boot default value. The bit[11:0] is "001000000000", so the block size is 0x200.(512bytes) 2. The SDMA address was 0x83123456 which was not page aligned and "s->sdmasysad % boundary_chk" was 0x23456. The value of boundary_count w= as 0x5cbaa.("boundary_chk - (s->sdmasysad % boundary_chk)" --> "(0x80000 - 0x23456)") However, boundary_count did not aligned the block size 512 bytes and the SD= MA address is not page aligned(0x80000), so the following if-statement never b= e true, ``` if (((boundary_count + begin) < block_size) && page_aligned) ```` Finally, it caused boundary_count overflow because its data type was uint32= _t. Ex: the last boundary_count was 0x1aa and "0x1aa - 0x200" became "0xffffffa= a". It is the wrong behavior. To fix it, it seems we can directly check the "boundary_count < blocksize" instead of "boundary_count < blocksize && page_aligned" Signed-off-by: Jamin Lin --- hw/sd/sdhci.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 37875c02c3..47d96b935b 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -590,7 +590,6 @@ static void sdhci_write_dataport(SDHCIState *s, uint32_= t value, unsigned size) /* Multi block SDMA transfer */ static void sdhci_sdma_transfer_multi_blocks(SDHCIState *s) { - bool page_aligned =3D false; unsigned int begin; const uint16_t block_size =3D s->blksize & BLOCK_SIZE_MASK; uint32_t boundary_chk =3D 1 << (((s->blksize & ~BLOCK_SIZE_MASK) >> 12= ) + 12); @@ -601,15 +600,6 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIStat= e *s) return; } =20 - /* - * XXX: Some sd/mmc drivers (for example, u-boot-slp) do not account f= or - * possible stop at page boundary if initial address is not page align= ed, - * allow them to work properly - */ - if ((s->sdmasysad % boundary_chk) =3D=3D 0) { - page_aligned =3D true; - } - s->prnsts |=3D SDHC_DATA_INHIBIT | SDHC_DAT_LINE_ACTIVE; if (s->trnmod & SDHC_TRNS_READ) { s->prnsts |=3D SDHC_DOING_READ; @@ -618,7 +608,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState= *s) sdbus_read_data(&s->sdbus, s->fifo_buffer, block_size); } begin =3D s->data_count; - if (((boundary_count + begin) < block_size) && page_aligned) { + if (((boundary_count + begin) < block_size)) { s->data_count =3D boundary_count + begin; boundary_count =3D 0; } else { @@ -634,7 +624,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState= *s) if (s->data_count =3D=3D block_size) { s->data_count =3D 0; } - if (page_aligned && boundary_count =3D=3D 0) { + if (boundary_count =3D=3D 0) { break; } } @@ -642,7 +632,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState= *s) s->prnsts |=3D SDHC_DOING_WRITE; while (s->blkcnt) { begin =3D s->data_count; - if (((boundary_count + begin) < block_size) && page_aligned) { + if (((boundary_count + begin) < block_size)) { s->data_count =3D boundary_count + begin; boundary_count =3D 0; } else { @@ -659,7 +649,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState= *s) s->blkcnt--; } } - if (page_aligned && boundary_count =3D=3D 0) { + if (boundary_count =3D=3D 0) { break; } } --=20 2.34.1