From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Daniel P . Berrangé" <berrange@redhat.com>,
qemu-block@nongnu.org, "Bin Meng" <bin.meng@windriver.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Tom Yan" <tom.ty89@gmail.com>,
"Alexander Bulekov" <alxndr@bu.edu>,
"Niek Linnenbank" <nieklinnenbank@gmail.com>,
"Michal Suchánek" <msuchanek@suse.de>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Warner Losh" <imp@bsdimp.com>
Subject: [RFC PATCH 9/9] hw/sd: Allow card size not power of 2 again
Date: Wed, 23 Jun 2021 20:00:21 +0200 [thread overview]
Message-ID: <20210623180021.898286-10-f4bug@amsat.org> (raw)
In-Reply-To: <20210623180021.898286-1-f4bug@amsat.org>
In commit a9bcedd15a5 ("hw/sd/sdcard: Do not allow invalid SD card
sizes") we tried to protect us from CVE-2020-13253 by only allowing
card with power-of-2 sizes. However doing so we disrupted valid user
cases. As a compromise, allow any card size, but warn only power of 2
sizes are supported, still suggesting the user how to increase a
card with 'qemu-img resize'.
Cc: Tom Yan <tom.ty89@gmail.com>
Cc: Warner Losh <imp@bsdimp.com>
Buglink: https://bugs.launchpad.net/qemu/+bug/1910586
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/sd/sd.c | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 9c8dd11bad1..cab4aab1475 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -2131,23 +2131,16 @@ static void sd_realize(DeviceState *dev, Error **errp)
blk_size = blk_getlength(sd->blk);
if (blk_size > 0 && !is_power_of_2(blk_size)) {
int64_t blk_size_aligned = pow2ceil(blk_size);
- char *blk_size_str;
+ g_autofree char *blk_size_s = size_to_str(blk_size);
+ g_autofree char *blk_size_aligned_s = size_to_str(blk_size_aligned);
- blk_size_str = size_to_str(blk_size);
- error_setg(errp, "Invalid SD card size: %s", blk_size_str);
- g_free(blk_size_str);
-
- blk_size_str = size_to_str(blk_size_aligned);
- error_append_hint(errp,
- "SD card size has to be a power of 2, e.g. %s.\n"
- "You can resize disk images with"
- " 'qemu-img resize <imagefile> <new-size>'\n"
- "(note that this will lose data if you make the"
- " image smaller than it currently is).\n",
- blk_size_str);
- g_free(blk_size_str);
-
- return;
+ warn_report("SD card size is not a power of 2 (%s). It might work"
+ " but is not supported by QEMU. If possible, resize"
+ " your disk image to %s with:",
+ blk_size_s, blk_size_aligned_s);
+ warn_report(" 'qemu-img resize <imagefile> <new-size>'");
+ warn_report("(note that this will lose data if you make the"
+ " image smaller than it currently is).");
}
ret = blk_set_perm(sd->blk, BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE,
--
2.31.1
next prev parent reply other threads:[~2021-06-23 18:06 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-23 18:00 [RFC PATCH 0/9] hw/sd: Allow card size not power of 2 again Philippe Mathieu-Daudé
2021-06-23 18:00 ` [PATCH 1/9] hw/sd: When card is in wrong state, log which state it is Philippe Mathieu-Daudé
2021-08-05 19:37 ` Eric Blake
2021-06-23 18:00 ` [PATCH 2/9] hw/sd: Extract address_in_range() helper, log invalid accesses Philippe Mathieu-Daudé
2021-08-05 19:46 ` Eric Blake
2021-06-23 18:00 ` [PATCH 3/9] tests/acceptance: Tag NetBSD tests as 'os:netbsd' Philippe Mathieu-Daudé
2021-07-03 8:41 ` Philippe Mathieu-Daudé
2021-07-03 8:43 ` Philippe Mathieu-Daudé
2021-07-04 12:35 ` Niek Linnenbank
2021-07-05 8:55 ` Philippe Mathieu-Daudé
2021-07-11 21:05 ` Philippe Mathieu-Daudé
2021-07-05 15:25 ` Willian Rampazzo
2021-07-13 16:57 ` Cleber Rosa
2021-06-23 18:00 ` [PATCH 4/9] tests/acceptance: Extract image_expand() helper Philippe Mathieu-Daudé
2021-07-05 15:27 ` Willian Rampazzo
2021-07-13 17:02 ` Cleber Rosa
2021-06-23 18:00 ` [PATCH 5/9] tests/acceptance: Use image_expand() in test_arm_orangepi_uboot_netbsd9 Philippe Mathieu-Daudé
2021-07-05 15:28 ` Willian Rampazzo
2021-08-04 20:54 ` Philippe Mathieu-Daudé
2021-08-05 17:06 ` Niek Linnenbank
2021-06-23 18:00 ` [RFC PATCH 6/9] tests/acceptance: Use image_expand() in test_arm_orangepi_bionic_20_08 Philippe Mathieu-Daudé
2021-07-05 15:30 ` Willian Rampazzo
2021-08-05 17:11 ` Niek Linnenbank
2021-06-23 18:00 ` [RFC PATCH 7/9] tests/acceptance: Do not expand SD card image in test_arm_orangepi_sd Philippe Mathieu-Daudé
2021-06-23 18:00 ` [PATCH 8/9] tests/acceptance: Remove now unused pow2ceil() Philippe Mathieu-Daudé
2021-07-05 15:32 ` Willian Rampazzo
2021-06-23 18:00 ` Philippe Mathieu-Daudé [this message]
2021-06-24 10:17 ` [RFC PATCH 9/9] hw/sd: Allow card size not power of 2 again Daniel P. Berrangé
2021-06-24 10:24 ` Tom Yan
2021-06-24 10:56 ` Peter Maydell
2021-06-24 16:08 ` Warner Losh
2021-06-24 2:50 ` [RFC PATCH 0/9] " Alexander Bulekov
2021-06-24 8:12 ` Philippe Mathieu-Daudé
2021-06-26 4:04 ` Alexander Bulekov
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=20210623180021.898286-10-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=alxndr@bu.edu \
--cc=berrange@redhat.com \
--cc=bin.meng@windriver.com \
--cc=imp@bsdimp.com \
--cc=msuchanek@suse.de \
--cc=nieklinnenbank@gmail.com \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=tom.ty89@gmail.com \
/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).