From: Zenghui Yu <zenghui.yu@linux.dev>
To: qemu-arm@nongnu.org, qemu-devel@nongnu.org
Cc: agraf@csgraf.de, mads@ynddal.dk, peter.maydell@linaro.org,
Zenghui Yu <zenghui.yu@linux.dev>
Subject: [PATCH v2 1/2] hvf: arm: Add permission check in GIC sysreg handlers
Date: Tue, 15 Jul 2025 00:01:38 +0800 [thread overview]
Message-ID: <20250714160139.10404-2-zenghui.yu@linux.dev> (raw)
In-Reply-To: <20250714160139.10404-1-zenghui.yu@linux.dev>
Quoting Peter Maydell:
" hvf_sysreg_read_cp() and hvf_sysreg_write_cp() do not check the .access
field of the ARMCPRegInfo to ensure that they forbid writes to registers
that are marked with a .access field that says they're read-only (and
ditto reads to write-only registers). "
Before we add more registers in GIC sysreg handlers, let's get it correct
by adding the .access checks to hvf_sysreg_read_cp() and
hvf_sysreg_write_cp(). With that, a sysreg access with invalid permission
will result in an UNDEFINED exception.
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Zenghui Yu <zenghui.yu@linux.dev>
---
I hard-code the @current_el parameter of cp_access_ok() to 1 because
* we only support EL0 and EL1 in HVF, and
* a GIC sysreg access from EL0 would result in an UNDEF exception which is
taken to EL1 (without going back to QEMU for emulation).
target/arm/hvf/hvf.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
index 0c7396ad6f..1db0b77fb6 100644
--- a/target/arm/hvf/hvf.c
+++ b/target/arm/hvf/hvf.c
@@ -1270,6 +1270,9 @@ static bool hvf_sysreg_read_cp(CPUState *cpu, uint32_t reg, uint64_t *val)
ri = get_arm_cp_reginfo(arm_cpu->cp_regs, hvf_reg2cp_reg(reg));
if (ri) {
+ if (!cp_access_ok(1, ri, true)) {
+ return false;
+ }
if (ri->accessfn) {
if (ri->accessfn(env, ri, true) != CP_ACCESS_OK) {
return false;
@@ -1550,6 +1553,9 @@ static bool hvf_sysreg_write_cp(CPUState *cpu, uint32_t reg, uint64_t val)
ri = get_arm_cp_reginfo(arm_cpu->cp_regs, hvf_reg2cp_reg(reg));
if (ri) {
+ if (!cp_access_ok(1, ri, false)) {
+ return false;
+ }
if (ri->accessfn) {
if (ri->accessfn(env, ri, false) != CP_ACCESS_OK) {
return false;
--
2.34.1
next prev parent reply other threads:[~2025-07-14 17:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-14 16:01 [PATCH v2 0/2] hvf: arm: two small GIC sysreg emulation fixes Zenghui Yu
2025-07-14 16:01 ` Zenghui Yu [this message]
2025-07-14 20:04 ` [PATCH v2 1/2] hvf: arm: Add permission check in GIC sysreg handlers Philippe Mathieu-Daudé
2025-07-15 15:40 ` Zenghui Yu
2025-07-21 10:19 ` Peter Maydell
2025-07-21 10:28 ` Mohamed Mediouni
2025-07-14 16:01 ` [PATCH v2 2/2] hvf: arm: Emulate ICC_RPR_EL1 accesses properly Zenghui Yu
2025-07-14 19:59 ` Philippe Mathieu-Daudé
2025-07-21 10:20 ` [PATCH v2 0/2] hvf: arm: two small GIC sysreg emulation fixes 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=20250714160139.10404-2-zenghui.yu@linux.dev \
--to=zenghui.yu@linux.dev \
--cc=agraf@csgraf.de \
--cc=mads@ynddal.dk \
--cc=peter.maydell@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 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.