ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/arm: Enforce PAN semantics in get_S1prot 

If we have a PAN-enforcing mmu_idx, set prot == 0 if user_rw != 0.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20200208125816.14954-14-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2020-02-08 12:58:09 +00:00 committed by Peter Maydell
parent 66412260cc
commit 81636b70c2
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/arm/helper.c
View File

@ -9569,6 +9569,9 @@ static int get_S1prot(CPUARMState *env, ARMMMUIdx mmu_idx, bool is_aa64,
if (is_user) { if (is_user) {
prot_rw = user_rw; prot_rw = user_rw;
} else { } else {
if (user_rw && regime_is_pan(env, mmu_idx)) {
return 0;
}
prot_rw = simple_ap_to_rw_prot_is_user(ap, false); prot_rw = simple_ap_to_rw_prot_is_user(ap, false);
} }

13
target/arm/internals.h
View File

@ -893,6 +893,19 @@ static inline bool regime_is_secure(CPUARMState *env, ARMMMUIdx mmu_idx)
} }
} }
static inline bool regime_is_pan(CPUARMState *env, ARMMMUIdx mmu_idx)
{
switch (mmu_idx) {
case ARMMMUIdx_Stage1_E1_PAN:
case ARMMMUIdx_E10_1_PAN:
case ARMMMUIdx_E20_2_PAN:
case ARMMMUIdx_SE10_1_PAN:
return true;
default:
return false;
}
}
/* Return the FSR value for a debug exception (watchpoint, hardware /* Return the FSR value for a debug exception (watchpoint, hardware
* breakpoint or BKPT insn) targeting the specified exception level. * breakpoint or BKPT insn) targeting the specified exception level.
*/ */