yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-07-06 10:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Enforce PAN semantics in get_S1prot

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

Backports commit 81636b70c226dc27d7ebc8dedbcec26166d23085 from qemu
This commit is contained in:
Richard Henderson 2020-03-21 17:35:54 -04:00 committed by Lioncash
parent 41d03da852
commit aad0621f96
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
qemu/target/arm/helper.c
View file

@ -9418,6 +9418,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
qemu/target/arm/internals.h
View file

@ -895,6 +895,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.
*/ */