mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/arm: Fix pauth_check_trap vs SEL2

Browse Source 
When arm_is_el2_enabled was introduced, we missed
updating pauth_check_trap.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/788
Fixes: e6ef0169264b ("target/arm: use arm_is_el2_enabled() where applicable")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20220315021205.342768-1-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2022-03-14 19:12:05 -07:00 committed by Peter Maydell
parent b17ab4705c
commit c179d3be7b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/arm/pauth_helper.c
View File

@ -390,7 +390,7 @@ static void QEMU_NORETURN pauth_trap(CPUARMState *env, int target_el,
static void pauth_check_trap(CPUARMState *env, int el, uintptr_t ra) static void pauth_check_trap(CPUARMState *env, int el, uintptr_t ra)
{ {
if (el < 2 && arm_feature(env, ARM_FEATURE_EL2)) { if (el < 2 && arm_is_el2_enabled(env)) {
uint64_t hcr = arm_hcr_el2_eff(env); uint64_t hcr = arm_hcr_el2_eff(env);
bool trap = !(hcr & HCR_API); bool trap = !(hcr & HCR_API);
if (el == 0) { if (el == 0) {