From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Alexander Bulekov" <alxndr@bu.edu>
Subject: [PULL 02/19] hw/sd/sdcard: Avoid OOB in sd_read_byte() during unexpected CMD switch
Date: Mon, 24 Jun 2024 15:14:23 +0200 [thread overview]
Message-ID: <20240624131440.81111-3-philmd@linaro.org> (raw)
In-Reply-To: <20240624131440.81111-1-philmd@linaro.org>
For multi-bytes commands, our implementation uses the @data_start
and @data_offset fields to track byte access. We initialize the
command start/offset in buffer once. Malicious guest might abuse
by switching command while staying in the 'transfer' state, switching
command buffer size, and our implementation can access out of buffer
boundary. For example, CMD17 (READ_SINGLE_BLOCK) allows to read up to
512 bytes, and CMD13 (SEND_STATUS) up to 64 bytes. By switching from
CMD17 to CMD13 (see reproducer below), bytes [64-511] are out of the
'status' buffer.
Our implementation return R0 status code for unexpected commands.
Such in-transaction command switch is unexpected and returns R0.
This is a good place to reset the start/offset fields to avoid
malicious accesses.
Can be reproduced running:
$ export UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1
$ cat << EOF | qemu-system-i386 \
-display none -nographic \
-machine accel=qtest -m 512M \
-nodefaults \
-device sdhci-pci,sd-spec-version=3 \
-device sd-card,drive=mydrive \
-drive if=none,index=0,file=null-co://,format=raw,id=mydrive \
-qtest stdio -trace sd\* -trace -sdbus_read
outl 0xcf8 0x80001010
outl 0xcfc 0xe0000000
outl 0xcf8 0x80001004
outw 0xcfc 0x02
write 0xe000002c 0x1 0x05
write 0xe000000f 0x1 0x37
write 0xe000000a 0x1 0x01
write 0xe000000f 0x1 0x29
write 0xe000000f 0x1 0x02
write 0xe000000f 0x1 0x03
write 0xe000000c 0x1 0x32
write 0xe000000f 0x1 0x06
write 0xe0000005 0x1 0x01
write 0xe0000007 0x1 0x01
write 0xe0000003 0x1 0x00
write 0xe000000f 0x1 0x11
write 0xe000002a 0x1 0x01
write 0xe000002a 0x1 0x02
write 0xe000000f 0x1 0x0d
write 0xe000002a 0x1 0x01
write 0xe000002a 0x1 0x02
EOF
hw/sd/sd.c:1984:15: runtime error: index 256 out of bounds for type 'uint8_t [64]'
#0 sd_read_byte hw/sd/sd.c:1984:15
#1 sdbus_read_data hw/sd/core.c:157:23
#2 sdhci_read_block_from_card hw/sd/sdhci.c:423:9
#3 sdhci_blkgap_write hw/sd/sdhci.c:1074:13
#4 sdhci_write hw/sd/sdhci.c:1195:13
#5 memory_region_write_accessor softmmu/memory.c:492:5
#6 access_with_adjusted_size softmmu/memory.c:554:18
#7 memory_region_dispatch_write softmmu/memory.c
#8 flatview_write_continue softmmu/physmem.c:2778:23
#9 flatview_write softmmu/physmem.c:2818:14
#10 address_space_write softmmu/physmem.c:2910:18
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior hw/sd/sd.c:1984:15
Reported-by: Alexander Bulekov <alxndr@bu.edu>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/487
Buglink: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=36240
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240408141717.66154-2-philmd@linaro.org>
---
hw/sd/sd.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 807b5d3de3..6a7a10501b 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1826,6 +1826,13 @@ send_response:
break;
case sd_r0:
+ /*
+ * Invalid state transition, reset implementation
+ * fields to avoid OOB abuse.
+ */
+ sd->data_start = 0;
+ sd->data_offset = 0;
+ /* fall-through */
case sd_illegal:
rsplen = 0;
break;
--
2.41.0
next prev parent reply other threads:[~2024-06-24 13:18 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-24 13:14 [PULL 00/19] SD/MMC patches for 2024-06-24 Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 01/19] bswap: Add st24_be_p() to store 24 bits in big-endian order Philippe Mathieu-Daudé
2024-06-24 13:14 ` Philippe Mathieu-Daudé [this message]
2024-06-24 13:14 ` [PULL 03/19] hw/sd/sdcard: Correct code indentation Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 04/19] hw/sd/sdcard: Rewrite sd_cmd_ALL_SEND_CID using switch case (CMD2) Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 05/19] hw/sd/sdcard: Fix typo in SEND_OP_COND command name Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 06/19] hw/sd/sdcard: Use HWBLOCK_SHIFT definition instead of magic values Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 07/19] hw/sd/sdcard: Use registerfield CSR::CURRENT_STATE definition Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 08/19] hw/sd/sdcard: Use Load/Store API to fill some CID/CSD registers Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 09/19] hw/sd/sdcard: Remove ACMD6 handler for SPI mode Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 10/19] hw/sd/sdcard: Remove explicit entries for illegal commands Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 11/19] hw/sd/sdcard: Trace update of block count (CMD23) Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 12/19] hw/sd/sdcard: Have cmd_valid_while_locked() return a boolean value Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 13/19] hw/sd/sdcard: Factor sd_req_get_rca() method out Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 14/19] hw/sd/sdcard: Only call sd_req_get_rca() where RCA is used Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 15/19] hw/sd/sdcard: Factor sd_req_get_address() method out Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 16/19] hw/sd/sdcard: Only call sd_req_get_address() where address is used Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 17/19] hw/sd/sdcard: Add sd_invalid_mode_for_cmd to report invalid mode switch Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 18/19] hw/sd/sdcard: Inline BLK_READ_BLOCK / BLK_WRITE_BLOCK macros Philippe Mathieu-Daudé
2024-06-24 13:14 ` [PULL 19/19] hw/sd/sdcard: Add comments around registers and commands Philippe Mathieu-Daudé
2024-06-25 4:30 ` [PULL 00/19] SD/MMC patches for 2024-06-24 Richard Henderson
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=20240624131440.81111-3-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=alxndr@bu.edu \
--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).