From nobody Wed Feb 11 05:28:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625241555; cv=none; d=zohomail.com; s=zohoarc; b=as6gs2SG1HmTDPIkJg9zVz5rOKb8UTy2P/Tg06FQd3ELrB0STKt7+Z5S3dWH3rULLzEYKivwRppuRM/Jlkb8sR9p4814n+BA4PR6f4tD/Fr5ddyN85mL3YVfuvhrtKdp8LPkIUtDqH8XcOrXEgYsE1NZX6RA7XbvIdSj9q0qzjM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625241555; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XI/+RLNcOZRL3x9ImO4jyG/hJF8EqE05K9qsRROWbv8=; b=l+h/PYHREn87cK3GatxPr8Tx2S/Qn5K/kKfAR6F00xbLv5vrOnnllcWlB4VzTEWk8EQVmNvuHL1vYI1M50NaXXt8NtFcmNPj/DKTKL3c10uHjz87nX+q9VYwAqa5sLAzZedT8EmIVdrBhHGH9vtvg+6m9biISP9/CMg798/hexU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1625241555352537.0704767986847; Fri, 2 Jul 2021 08:59:15 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id m18so13065571wrv.2 for ; Fri, 02 Jul 2021 08:59:14 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.Ascou-CH1 (pop.92-184-108-23.mobile.abo.orange.fr. [92.184.108.23]) by smtp.gmail.com with ESMTPSA id p16sm3559040wrs.52.2021.07.02.08.59.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jul 2021 08:59:13 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=XI/+RLNcOZRL3x9ImO4jyG/hJF8EqE05K9qsRROWbv8=; b=A8Ro89JPYfcDN835ciSNyfD5YervCwIvX2gZUkgvX3W7GrfUAJbZb87jafGQjlffBo 08LQOGdxSg8Sbz0JmwatBoD3qMYo+i0WTDzyIZwg+Jioi52DJAngNt4xO7mOM5ehlrLT MYZikWnTve+JI5pnPZQAW6GM+10cdiOcc4o4iF+tsr1zw47qIHuYYo7TA5AVnTH3V4Qh W8OickJHhaG4RSAXpb3ODJ7HMrv12eZzbXxPeGn0jXLrltrW6zCVsVsKRzxw+Ko26FIl 9vr8fkml8wWUB2SgMQFj4SsajDNi4gULUszrD21DiUBeRy8XlO/U/i3vbu2pMdRRodmV W1iQ== 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:mime-version:content-transfer-encoding; bh=XI/+RLNcOZRL3x9ImO4jyG/hJF8EqE05K9qsRROWbv8=; b=odcXJRDq1ZGhkLgs9Sebbdsb90RyPopveU8XoJSQiZSoAsZiHJnBGiQQYknRTSPC/q TaFIhpzcYnv8NodhF6ik74qu2a/zIqVmr0MIZa2XEETrw6KPRQV/YNzhPuUw/GERcqU5 wozE3NDsufp+r2Jeia6yZOcPt/8MkLoyGOZ53djs/O7RJI/I3vSjv5Aaeb54rUjK47Pi cb1quYHKnHB66ok2U4e2h/9ChNwBxAgdJm1nWZ88HzLhVYUHYoGfp0/Nc0yIDeeg5YpF JMMv5VQCJpo1mllRS6wM8eHZq+/7JRyVsKzF+gF/eutAwXYj6V5k+evJUT0nCG+hv5Qo chmA== X-Gm-Message-State: AOAM5332Cn1FmMbonbTRThL8g6zUIaopc6xcht38pDsu+jmuFzh309O0 agc6M4M7F64i9pDKZV1f6h0= X-Google-Smtp-Source: ABdhPJwtTbVVjQ1W2ll43RNguZT5N1bkrhT88ZwnatNXr0G+jwvPyvBlR30OzrV8+zWqYuw0uw7BCA== X-Received: by 2002:adf:d1cd:: with SMTP id b13mr387631wrd.228.1625241553661; Fri, 02 Jul 2021 08:59:13 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Alexander Bulekov , Michael Olbrich , Bin Meng , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng Subject: [PATCH 2/3] hw/sd: Extract address_in_range() helper, log invalid accesses Date: Fri, 2 Jul 2021 17:58:59 +0200 Message-Id: <20210702155900.148665-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210702155900.148665-1-f4bug@amsat.org> References: <20210702155900.148665-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625241557453100001 Multiple commands have to check the address requested is valid. Extract this code pattern as a new address_in_range() helper, and log invalid accesses as guest errors. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Bin Meng Message-Id: <20210624142209.1193073-3-f4bug@amsat.org> --- hw/sd/sd.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index d8fdf84f4db..9c8dd11bad1 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -937,6 +937,18 @@ static void sd_lock_command(SDState *sd) sd->card_status &=3D ~CARD_IS_LOCKED; } =20 +static bool address_in_range(SDState *sd, const char *desc, + uint64_t addr, uint32_t length) +{ + if (addr + length > sd->size) { + qemu_log_mask(LOG_GUEST_ERROR, "%s offset %lu > card %lu [%%%u]\n", + desc, addr, sd->size, length); + sd->card_status |=3D ADDRESS_ERROR; + return false; + } + return true; +} + static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) { uint32_t rca =3D 0x0000; @@ -1218,8 +1230,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) switch (sd->state) { case sd_transfer_state: =20 - if (addr + sd->blk_len > sd->size) { - sd->card_status |=3D ADDRESS_ERROR; + if (!address_in_range(sd, "READ_BLOCK", addr, sd->blk_len)) { return sd_r1; } =20 @@ -1264,8 +1275,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) switch (sd->state) { case sd_transfer_state: =20 - if (addr + sd->blk_len > sd->size) { - sd->card_status |=3D ADDRESS_ERROR; + if (!address_in_range(sd, "WRITE_BLOCK", addr, sd->blk_len)) { return sd_r1; } =20 @@ -1325,8 +1335,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) =20 switch (sd->state) { case sd_transfer_state: - if (addr >=3D sd->size) { - sd->card_status |=3D ADDRESS_ERROR; + if (!address_in_range(sd, "SET_WRITE_PROT", addr, 1)) { return sd_r1b; } =20 @@ -1348,8 +1357,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) =20 switch (sd->state) { case sd_transfer_state: - if (addr >=3D sd->size) { - sd->card_status |=3D ADDRESS_ERROR; + if (!address_in_range(sd, "CLR_WRITE_PROT", addr, 1)) { return sd_r1b; } =20 @@ -1826,8 +1834,8 @@ void sd_write_byte(SDState *sd, uint8_t value) case 25: /* CMD25: WRITE_MULTIPLE_BLOCK */ if (sd->data_offset =3D=3D 0) { /* Start of the block - let's check the address is valid */ - if (sd->data_start + sd->blk_len > sd->size) { - sd->card_status |=3D ADDRESS_ERROR; + if (!address_in_range(sd, "WRITE_MULTIPLE_BLOCK", + sd->data_start, sd->blk_len)) { break; } if (sd->size <=3D SDSC_MAX_CAPACITY) { @@ -1999,8 +2007,8 @@ uint8_t sd_read_byte(SDState *sd) =20 case 18: /* CMD18: READ_MULTIPLE_BLOCK */ if (sd->data_offset =3D=3D 0) { - if (sd->data_start + io_len > sd->size) { - sd->card_status |=3D ADDRESS_ERROR; + if (!address_in_range(sd, "READ_MULTIPLE_BLOCK", + sd->data_start, io_len)) { return 0x00; } BLK_READ_BLOCK(sd->data_start, io_len); --=20 2.31.1