From nobody Sat Nov 15 08:31:45 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1753998535; cv=none; d=zohomail.com; s=zohoarc; b=BKj/jjvz7w+S0jxrOJi8Ix+oKUQrZhAy5pUIjNJ5xjJ8TBPa+L7s5A8ZGICkKHS7K9CklrIu0qEAaul5PvPkY/ApcCNcfeyV/D7UV4T0fxVaEVMHh7Gb3Mp4KbIG4+5WZTlI6MXTyvEdXxVpcWIIwNQTPYuoHGhamr1yhLvsLAE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753998535; 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:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3YPXddK5v6Xqtrub7LpqRKl+Wnp2Pnfr2Y1mDvAIzEY=; b=PJennIBj902p0ivmUStA21bRcfngk3xNGRc/4/dVwwIkgqCK7wJ4iryKY4p401wfNvZuuqclG7SE1QppprmJzVqUTIm2hkS6+agCC5xWJp7Os9SikqkZZPICIRaV/NhFYYuLT5VHK+1VVw6Ho5pBcGGgDnGpDmapTh6Fk5WoqW0= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1753998535874164.07336804642512; Thu, 31 Jul 2025 14:48:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhb8S-0007pT-2X; Thu, 31 Jul 2025 17:48:24 -0400 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 1uhapD-0000Yu-HW for qemu-devel@nongnu.org; Thu, 31 Jul 2025 17:28:31 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uhapA-0007tm-MG for qemu-devel@nongnu.org; Thu, 31 Jul 2025 17:28:31 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3b79bdc9a7dso106191f8f.1 for ; Thu, 31 Jul 2025 14:28:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b79c3abec8sm3742066f8f.8.2025.07.31.14.28.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Jul 2025 14:28:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753997306; x=1754602106; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3YPXddK5v6Xqtrub7LpqRKl+Wnp2Pnfr2Y1mDvAIzEY=; b=guikIQ796S6Q8ndeZxADvDj0htenmATMken99Mucg0v+Stbqxk/3znVEpqW5ODP42n xm7c6TZ1lEeWArjI46/U1/vHrYVEOe/U+Wg6+wF+E9nu1RzYXMbMkO5khQ+RAM1AWukb JCPRVD+oBxXuSXXk1TRJ4GKY2pHLm0NRp7RFrfTOd0QcOUOaQvkg+FnsSIKL5VBYM0fu 5xo8qQuWItrmCW4R7fZruMDcBzJyy1lUX0tV/7Kl5ztulWx8OxuGMj57fX0pjiTfF1P2 7+AfyHCwX8FdeRUgL1nIGTfTd/NRI6gW3fpGjjxpJlOARz4FvPN659TaqP3EzVovcJO1 mzAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753997306; x=1754602106; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3YPXddK5v6Xqtrub7LpqRKl+Wnp2Pnfr2Y1mDvAIzEY=; b=OR1rEZ+x4gt32p4foRgCx7nCHXthD6uCAh27NLPB41IJ8w4NlemYLCHj/G1FpcvKSd j+PJDEe6COPMIV29fuUvCbbj+fAp1JQgTXTwy/kHLQuiKALvmXeAfB3cXL3degQMo1EP BCumGK6y3BQoVRilE00HY00vS9iOBo+bZOP6v/noInaln9mJWJL9164BrXxLDq80LzO8 83XMV0mTt8BHsa0RhHBDOvPZ0aMtEL/XaEny3OVxv0pgcVu4WtdLwXfEZ6c1T5ewq/w+ IX8VOmANu66lglrXBLHEBvPoJTg7WTZ62C+JDITFytsrvMsjrZ6SXXyad6kakzGghJOY Rkdw== X-Gm-Message-State: AOJu0Yw4KotnSpFuUx5ZUonCByekTjCAa4asAXMSpWp2WpVSq6dmc2rp W8SoesuKKuuCbABCaVNntDdKJRX08KraxWEMJhgM59k1vi2WnL+uI9NR972qEmQ64dIvPA1RwY1 3BT0G X-Gm-Gg: ASbGncuWHpHwfcLwf0yM4ON+DrcOHZCq08mLyJss1XfCmZVf8AROqcKHa/u6FN+M52D gj70ykM+t+tK8xBS3gzlQ94XtAslNZcdc3wkfmNVzRYaLuVKp69ook4Q1XTM5bGOl6z7McEYi2E qUOmGSLVSr3a1Ks3Gz/CWgAgYt2Cl+sFQ9XiC6ecVOy9/nTlw7phEWgDGmAXbt4oMtEz4SX2vga U6W3PiVVZ+5h36kDRWTKdg+KloeUpbyHZ9NljbSymkA6DPM/Gsml26tolWVxnd1jKLyoUxUpvaK 5mmeT+S0G6vQWuDjMApckBuF+2EtL+WBW9Koxvkczdv2TsNovO3kqiIr1CVDXpshRMxATkSC8MA IWtoM6o9AVnVVPFWEzWfkeF7k6AWqlpiLzuSi2Kd6vQSk6YTWVl7SbPsJ+E4XPKQR9PFHVViHHt vqaCBc1Z4= X-Google-Smtp-Source: AGHT+IGI/zApcUREjex3r/KFRt72ym9B43x474plpmVmVHVsNwAXFaOO3Mt4foWnSu7ahDM6LVfaiw== X-Received: by 2002:adf:e9ca:0:b0:3a4:ef70:e0e1 with SMTP id ffacd0b85a97d-3b795022391mr6020703f8f.55.1753997306488; Thu, 31 Jul 2025 14:28:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: Guenter Roeck , Palmer Dabbelt , Liu Zhiwei , Daniel Henrique Barboza , Strahinja Jankovic , qemu-riscv@nongnu.org, qemu-arm@nongnu.org, Bin Meng , Alistair Francis , Beniamino Galvani , Ben Dooks , Weiwei Li , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 03/11] hw/sd/sdcard: Propagate response size to sd_response_r*_make() Date: Thu, 31 Jul 2025 23:27:58 +0200 Message-ID: <20250731212807.2706-4-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250731212807.2706-1-philmd@linaro.org> References: <20250731212807.2706-1-philmd@linaro.org> 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::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1753998539136116600 All sd_response_r*_make() fill the @response buffer. Now that sd_do_command() knows the buffer size, propagate it to the response fillers and assert for any overflow. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 1d88aee38d5..22bdb4ca3ab 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -729,34 +729,52 @@ static int sd_req_crc_validate(SDRequest *req) return sd_crc7(buffer, 5) !=3D req->crc; /* TODO */ } =20 -static void sd_response_r1_make(SDState *sd, uint8_t *response) +static size_t sd_response_r1_make(SDState *sd, uint8_t *response, size_t r= espsz) { + size_t rsplen =3D 4; + + assert(respsz >=3D 4); stl_be_p(response, sd->card_status); =20 /* Clear the "clear on read" status bits */ sd->card_status &=3D ~CARD_STATUS_C; + + return rsplen; } =20 -static void sd_response_r3_make(SDState *sd, uint8_t *response) +static size_t sd_response_r3_make(SDState *sd, uint8_t *response, size_t r= espsz) { + size_t rsplen =3D 4; + + assert(respsz >=3D rsplen); stl_be_p(response, sd->ocr & ACMD41_R3_MASK); + + return rsplen; } =20 -static void sd_response_r6_make(SDState *sd, uint8_t *response) +static size_t sd_response_r6_make(SDState *sd, uint8_t *response, size_t r= espsz) { uint16_t status; =20 + assert(respsz >=3D 4); status =3D ((sd->card_status >> 8) & 0xc000) | ((sd->card_status >> 6) & 0x2000) | (sd->card_status & 0x1fff); sd->card_status &=3D ~(CARD_STATUS_C & 0xc81fff); stw_be_p(response + 0, sd->rca); stw_be_p(response + 2, status); + + return 4; } =20 -static void sd_response_r7_make(SDState *sd, uint8_t *response) +static size_t sd_response_r7_make(SDState *sd, uint8_t *response, size_t r= espsz) { + size_t rsplen =3D 4; + + assert(respsz >=3D rsplen); stl_be_p(response, sd->vhs); + + return rsplen; } =20 static uint32_t sd_blk_len(SDState *sd) @@ -2207,33 +2225,31 @@ send_response: switch (rtype) { case sd_r1: case sd_r1b: - sd_response_r1_make(sd, response); - rsplen =3D 4; + rsplen =3D sd_response_r1_make(sd, response, respsz); break; =20 case sd_r2_i: + assert(respsz >=3D 16); memcpy(response, sd->cid, sizeof(sd->cid)); rsplen =3D 16; break; =20 case sd_r2_s: + assert(respsz >=3D 16); memcpy(response, sd->csd, sizeof(sd->csd)); rsplen =3D 16; break; =20 case sd_r3: - sd_response_r3_make(sd, response); - rsplen =3D 4; + rsplen =3D sd_response_r3_make(sd, response, respsz); break; =20 case sd_r6: - sd_response_r6_make(sd, response); - rsplen =3D 4; + rsplen =3D sd_response_r6_make(sd, response, respsz); break; =20 case sd_r7: - sd_response_r7_make(sd, response); - rsplen =3D 4; + rsplen =3D sd_response_r7_make(sd, response, respsz); break; =20 case sd_r0: --=20 2.49.0