@samitouri / QOSamiQemu / commits / 612f22c19d

target/riscv/pmp: Fix integer overflow in TOR and NA4 address computation

According to the RISC-V Privileged Manual: "The Sv32 page-based virtual-memory scheme described in sv32 supports 34-bit physical addresses for RV32, so the PMP scheme must support addresses wider than XLEN for RV32." However, the current QEMU implementation uses `target_ulong` (which resolves to `uint32_t` on RV32) for PMP address variables. When shifting these addresses left (e.g., `this_addr << 2`), an integer overflow occurs, truncating the high bits of the 34-bit physical address. Fix this issue by changing the types of PMP address variables (`this_addr` and `prev_addr`) to `hwaddr`. This issue was discovered and reported by SpecHunter, an AI-driven architecture specification analysis tool. Link: https://github.com/yizishun/rv-isa-sec/blob/master/output/riscv-isa-manual/pr-2472/qemu.txt Signed-off-by: Zishun Yi <vulab@iscas.ac.cn> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com> Message-ID: <20260511102627.3120140-1-vulab@iscas.ac.cn> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

Zishun Yi committed May 11, 2026 at 18:26 UTC 612f22c19db8adbe9b155f199ede01e86cc1546c
1 file changed +2 -2
target/riscv/pmp.c
+2 -2
@@ -227,8 +227,8 @@ static void pmp_decode_napot(hwaddr a, hwaddr *sa, hwaddr *ea)
227 void pmp_update_rule_addr(CPURISCVState *env, uint32_t pmp_index)
228 {
229 uint8_t this_cfg = env->pmp_state.pmp[pmp_index].cfg_reg;
230 - target_ulong this_addr = env->pmp_state.pmp[pmp_index].addr_reg;
231 - target_ulong prev_addr = 0u;
230 + hwaddr this_addr = env->pmp_state.pmp[pmp_index].addr_reg;
231 + hwaddr prev_addr = 0u;
232 hwaddr sa = 0u;
233 hwaddr ea = 0u;
234 int g = pmp_get_granularity_g(env);