From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: David Gibson <david@gibson.dropbear.id.au>,
Peter Maydell <peter.maydell@linaro.org>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-devel@nongnu.org, "Paul Burton" <paul.burton@mips.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PATCH v3 2/2] loader: Fix 64-bit misaligned member access
Date: Mon, 23 Apr 2018 13:25:23 -0300 [thread overview]
Message-ID: <20180423162523.6392-3-f4bug@amsat.org> (raw)
In-Reply-To: <20180423162523.6392-1-f4bug@amsat.org>
The libfdt does not guarantee than fdt_getprop() returns a pointer
aligned to the property size.
Assuming the base of the fdt is aligned, a 32-bit property returns
a 32-bit aligned pointer. This is however not guaranteed for 64-bit
properties, where 64-bit loads might trigger unaligned access.
Fix this issue by using the ldst (host) API, which does a local copy
on the stack, thus guaranteeing a safe aligned access.
This fixes the following ASan warning:
$ mips64el-softmmu/qemu-system-mips64el -M boston -kernel vmlinux.gz.itb -nographic
hw/core/loader-fit.c:108:17: runtime error: load of misaligned address 0x7f95cd7e4264 for type 'fdt64_t', which requires 8 byte alignment
0x7f95cd7e4264: note: pointer points here
00 00 00 3e ff ff ff ff 80 7d 2a c0 00 00 00 01 68 61 73 68 40 30 00 00 00 00 00 03 00 00 00 14
^
Reported-by: AddressSanitizer
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/core/loader-fit.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c
index 0c4a7207f4..628f854636 100644
--- a/hw/core/loader-fit.c
+++ b/hw/core/loader-fit.c
@@ -102,10 +102,10 @@ static int fit_image_addr(const void *itb, int img, const char *name,
switch (len) {
case 4:
- *addr = fdt32_to_cpu(*(fdt32_t *)prop);
+ *addr = fdt32_to_cpu(ldl_he_p(prop));
return 0;
case 8:
- *addr = fdt64_to_cpu(*(fdt64_t *)prop);
+ *addr = fdt64_to_cpu(ldq_he_p(prop));
return 0;
default:
error_printf("invalid %s address length %d\n", name, len);
--
2.17.0
next prev parent reply other threads:[~2018-04-23 16:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-23 16:25 [Qemu-devel] [PATCH v3 0/2] loader: Fix misaligned member access Philippe Mathieu-Daudé
2018-04-23 16:25 ` [Qemu-devel] [PATCH v3 1/2] bswap.h: Fix ldl_he_p() signedness Philippe Mathieu-Daudé
2018-04-23 16:56 ` Peter Maydell
2018-04-24 22:18 ` Philippe Mathieu-Daudé
2018-04-23 17:32 ` Richard Henderson
2018-05-25 14:06 ` Paolo Bonzini
2018-04-23 16:25 ` Philippe Mathieu-Daudé [this message]
2018-04-23 17:34 ` [Qemu-devel] [PATCH v3 2/2] loader: Fix 64-bit misaligned member access Richard Henderson
2018-04-23 17:38 ` Philippe Mathieu-Daudé
2018-05-25 14:07 ` Paolo Bonzini
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=20180423162523.6392-3-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=david@gibson.dropbear.id.au \
--cc=marcandre.lureau@redhat.com \
--cc=paul.burton@mips.com \
--cc=peter.maydell@linaro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.