target/riscv: Fix pmp range wraparound on zero
PATCH 1/1 target/riscv: Fix pmp range wraparound on zero
pmp_is_in_range() prefers to match addresses within the interval [start, end]. To archieve this, pmpaddrX is decremented during the end address update.
In TOR mode, a rule is ignored if its start address is greater than or equal to its end address.
However, if pmpaddrX is set to 0, this decrement operation causes the calulated end address to wrap around to UINT_MAX. In this scenario, the address guard for this PMP entry would become ineffective.
This patch addresses the issue by moving the guard check earlier, preventing the problematic wraparound when pmpaddrX is zero.
--- target/riscv/pmp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
target/riscv/pmp.c +4 -3
@@ -211,11 +211,12 @@ void pmp_update_rule_addr(CPURISCVState *env, uint32_t pmp_index)break ;case PMP_AMATCH_TOR : - sa = prev_addr <<2 ;/* shift up from [xx:0] to [xx+2:2] */ - ea = (this_addr <<2 ) -1u ; -if (sa > ea) { +if (prev_addr >= this_addr) { sa = ea =0u ; +break ; } + sa = prev_addr <<2 ;/* shift up from [xx:0] to [xx+2:2] */ + ea = (this_addr <<2 ) -1u ;break ;case PMP_AMATCH_NA4 :
Signature · 1 line
2.50.0
Quoted 8 lines · Vac Chen
pmp_is_in_range()prefers to match addresses within the interval [start, end]. To archieve this, pmpaddrX is decremented during the end address update.In TOR mode, a rule is ignored if its start address is greater than or equal to its end address.
Quoted 8 lines
However, if pmpaddrX is set to 0, this decrement operation causes the calulated end address to wrap around to
UINT_MAX. In this scenario, the address guard for this PMP entry would become ineffective.This patch addresses the issue by moving the guard check earlier, preventing the problematic wraparound when pmpaddrX is zero.
Signed-off-by Vac Chen <[email protected]>
Alistair
Quoted 28 lines
--- target/riscv/pmp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)target/riscv/pmp.c +4
-4@@ -211,11 +211,12 @@ void pmp_update_rule_addr(CPURISCVState *env, uint32_t pmp_index)break ;case PMP_AMATCH_TOR : - sa = prev_addr <<2 ;/* shift up from [xx:0] to [xx+2:2] */ - ea = (this_addr <<2 ) -1u ; -if (sa > ea) { +if (prev_addr >= this_addr) { sa = ea =0u ; +break ; } + sa = prev_addr <<2 ;/* shift up from [xx:0] to [xx+2:2] */ + ea = (this_addr <<2 ) -1u ;break ;case PMP_AMATCH_NA4 : --2.50.0
Alistair Francis
AppliedQuoted 8 lines · Vac Chen
pmp_is_in_range()prefers to match addresses within the interval [start, end]. To archieve this, pmpaddrX is decremented during the end address update.In TOR mode, a rule is ignored if its start address is greater than or equal to its end address.
Quoted 8 lines
However, if pmpaddrX is set to 0, this decrement operation causes the calulated end address to wrap around to
UINT_MAX. In this scenario, the address guard for this PMP entry would become ineffective.This patch addresses the issue by moving the guard check earlier, preventing the problematic wraparound when pmpaddrX is zero.
Signed-off-by Vac Chen <[email protected]>
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 28 lines
--- target/riscv/pmp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)target/riscv/pmp.c +4
-4@@ -211,11 +211,12 @@ void pmp_update_rule_addr(CPURISCVState *env, uint32_t pmp_index)break ;case PMP_AMATCH_TOR : - sa = prev_addr <<2 ;/* shift up from [xx:0] to [xx+2:2] */ - ea = (this_addr <<2 ) -1u ; -if (sa > ea) { +if (prev_addr >= this_addr) { sa = ea =0u ; +break ; } + sa = prev_addr <<2 ;/* shift up from [xx:0] to [xx+2:2] */ + ea = (this_addr <<2 ) -1u ;break ;case PMP_AMATCH_NA4 : --2.50.0