qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	qemu-block@nongnu.org
Subject: [PATCH v4 07/14] hw/sd/sdcard: Check address is in range
Date: Fri, 26 Jun 2020 18:28:11 +0200	[thread overview]
Message-ID: <20200626162818.25840-8-f4bug@amsat.org> (raw)
In-Reply-To: <20200626162818.25840-1-f4bug@amsat.org>

As a defense, assert if the requested address is out of the card area.

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/sd/sd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 871c30a67f..0b606e9054 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -539,6 +539,8 @@ static void sd_response_r7_make(SDState *sd, uint8_t *response)
 
 static inline uint64_t sd_addr_to_wpnum(uint64_t addr)
 {
+    assert(addr < sd->size);
+
     return addr >> (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT);
 }
 
-- 
2.21.3



  parent reply	other threads:[~2020-06-26 16:32 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-26 16:28 [PATCH v4 00/14] hw/sd/sdcard: Fix CVE-2020-13253 & cleanups Philippe Mathieu-Daudé
2020-06-26 16:28 ` [PATCH v4 01/14] MAINTAINERS: Cc qemu-block mailing list Philippe Mathieu-Daudé
2020-06-26 16:28 ` [PATCH v4 02/14] hw/sd/sdcard: Update coding style to make checkpatch.pl happy Philippe Mathieu-Daudé
2020-06-26 16:28 ` [PATCH v4 03/14] hw/sd/sdcard: Move some definitions to use them earlier Philippe Mathieu-Daudé
2020-06-26 16:28 ` [PATCH v4 04/14] hw/sd/sdcard: Use the HWBLOCK_SIZE definition Philippe Mathieu-Daudé
2020-06-26 16:28 ` [PATCH v4 05/14] hw/sd/sdcard: Do not switch to ReceivingData if address is invalid Philippe Mathieu-Daudé
2020-06-26 16:28 ` [PATCH v4 06/14] hw/sd/sdcard: Restrict Class 6 commands to SCSD cards Philippe Mathieu-Daudé
2020-06-26 16:28 ` Philippe Mathieu-Daudé [this message]
2020-06-26 16:28 ` [PATCH v4 08/14] hw/sd/sdcard: Update the SDState documentation Philippe Mathieu-Daudé
2020-06-26 16:28 ` [PATCH v4 09/14] hw/sd/sdcard: Simplify cmd_valid_while_locked() Philippe Mathieu-Daudé
2020-06-26 16:28 ` [PATCH v4 10/14] hw/sd/sdcard: Constify sd_crc*()'s message argument Philippe Mathieu-Daudé
2020-06-26 16:28 ` [PATCH v4 11/14] hw/sd/sdcard: Make iolen unsigned Philippe Mathieu-Daudé
2020-06-26 16:28 ` [PATCH v4 12/14] hw/sd/sdcard: Correctly display the command name in trace events Philippe Mathieu-Daudé
2020-06-26 16:28 ` [PATCH v4 13/14] hw/sd/sdcard: Display offset in read/write_data() " Philippe Mathieu-Daudé
2020-06-26 16:28 ` [PATCH v4 14/14] hw/sd/sdcard: Simplify realize() a bit Philippe Mathieu-Daudé
2020-06-26 16:30 ` [PATCH v4 00/14] hw/sd/sdcard: Fix CVE-2020-13253 & cleanups Philippe Mathieu-Daudé
2020-06-26 16:51 ` no-reply
2020-06-26 16:54 ` no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200626162818.25840-8-f4bug@amsat.org \
    --to=f4bug@amsat.org \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).