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>,
qemu-block@nongnu.org
Subject: [PATCH v4 11/14] hw/sd/sdcard: Make iolen unsigned
Date: Fri, 26 Jun 2020 18:28:15 +0200 [thread overview]
Message-ID: <20200626162818.25840-12-f4bug@amsat.org> (raw)
In-Reply-To: <20200626162818.25840-1-f4bug@amsat.org>
From: Philippe Mathieu-Daudé <philmd@redhat.com>
I/O request length can not be negative.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v4: Use uint32_t (pm215)
---
hw/sd/sd.c | 2 +-
hw/sd/trace-events | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index a0500f4551..8dd83c365c 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1967,7 +1967,7 @@ uint8_t sd_read_data(SDState *sd)
{
/* TODO: Append CRCs */
uint8_t ret;
- int io_len;
+ uint32_t io_len;
if (!sd->blk || !blk_is_inserted(sd->blk) || !sd->enable)
return 0x00;
diff --git a/hw/sd/trace-events b/hw/sd/trace-events
index 5f09d32eb2..d0cd7c6ec4 100644
--- a/hw/sd/trace-events
+++ b/hw/sd/trace-events
@@ -52,7 +52,7 @@ sdcard_unlock(void) ""
sdcard_read_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x"
sdcard_write_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x"
sdcard_write_data(const char *proto, const char *cmd_desc, uint8_t cmd, uint8_t value) "%s %20s/ CMD%02d value 0x%02x"
-sdcard_read_data(const char *proto, const char *cmd_desc, uint8_t cmd, int length) "%s %20s/ CMD%02d len %d"
+sdcard_read_data(const char *proto, const char *cmd_desc, uint8_t cmd, uint32_t length) "%s %20s/ CMD%02d len %" PRIu32
sdcard_set_voltage(uint16_t millivolts) "%u mV"
# milkymist-memcard.c
--
2.21.3
next prev parent reply other threads:[~2020-06-26 16:38 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 ` [PATCH v4 07/14] hw/sd/sdcard: Check address is in range Philippe Mathieu-Daudé
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 ` Philippe Mathieu-Daudé [this message]
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-12-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).