From: Zheyu Ma <zheyuma97@gmail.com>
To: "Peter Maydell" <peter.maydell@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Cc: Zheyu Ma <zheyuma97@gmail.com>,
qemu-arm@nongnu.org, qemu-devel@nongnu.org
Subject: [PATCH] hw/misc/bcm2835_thermal: Handle invalid address accesses gracefully
Date: Sun, 30 Jun 2024 17:14:14 +0200 [thread overview]
Message-ID: <20240630151414.2969772-1-zheyuma97@gmail.com> (raw)
This commit handles invalid address accesses gracefully in both read and write
functions. Instead of asserting and aborting, it logs an error message and returns
a neutral value for read operations and does nothing for write operations.
Error log:
ERROR:hw/misc/bcm2835_thermal.c:55:bcm2835_thermal_read: code should not be reached
Bail out! ERROR:hw/misc/bcm2835_thermal.c:55:bcm2835_thermal_read: code should not be reached
Aborted
Reproducer:
cat << EOF | qemu-system-aarch64 -display \
none -machine accel=qtest, -m 512M -machine raspi3b -m 1G -qtest stdio
readw 0x3f212003
EOF
Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
---
hw/misc/bcm2835_thermal.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/misc/bcm2835_thermal.c b/hw/misc/bcm2835_thermal.c
index ee7816b8a5..5c2a429d58 100644
--- a/hw/misc/bcm2835_thermal.c
+++ b/hw/misc/bcm2835_thermal.c
@@ -51,8 +51,10 @@ static uint64_t bcm2835_thermal_read(void *opaque, hwaddr addr, unsigned size)
val = FIELD_DP32(bcm2835_thermal_temp2adc(25), STAT, VALID, true);
break;
default:
- /* MemoryRegionOps are aligned, so this can not happen. */
- g_assert_not_reached();
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "bcm2835_thermal_read: invalid address 0x%"
+ HWADDR_PRIx "\n", addr);
+ val = 0;
}
return val;
}
@@ -72,8 +74,10 @@ static void bcm2835_thermal_write(void *opaque, hwaddr addr,
__func__, value, addr);
break;
default:
- /* MemoryRegionOps are aligned, so this can not happen. */
- g_assert_not_reached();
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "bcm2835_thermal_write: invalid address 0x%"
+ HWADDR_PRIx "\n", addr);
+ break;
}
}
--
2.34.1
next reply other threads:[~2024-06-30 15:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-30 15:14 Zheyu Ma [this message]
2024-07-01 3:29 ` [PATCH] hw/misc/bcm2835_thermal: Handle invalid address accesses gracefully Xingtao Yao (Fujitsu) via
2024-07-01 11:18 ` Philippe Mathieu-Daudé
2024-07-01 13:26 ` Peter Maydell
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=20240630151414.2969772-1-zheyuma97@gmail.com \
--to=zheyuma97@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@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).