aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Lugou <florian.lugou@provenrun.com>2022-05-17 16:52:42 +0200
committerPeter Maydell <peter.maydell@linaro.org>2022-05-19 16:19:03 +0100
commit07b034ea828eb089de1a88e0043a8f3065f2d205 (patch)
tree338643d52a49a90eddf4af0a2e7c7d2d1b16f876
parent9598c1bb39b2d4f0d3a55072cc70251c452132cd (diff)
target/arm: Fix PAuth keys access checks for disabled SEL2
As per the description of the HCR_EL2.APK field in the ARMv8 ARM, Pointer Authentication keys accesses should only be trapped to Secure EL2 if it is enabled. Signed-off-by: Florian Lugou <florian.lugou@provenrun.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20220517145242.1215271-1-florian.lugou@provenrun.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--target/arm/helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c
index aa7a8e0572..fdd51e5e75 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -6768,7 +6768,7 @@ static CPAccessResult access_pauth(CPUARMState *env, const ARMCPRegInfo *ri,
int el = arm_current_el(env);
if (el < 2 &&
- arm_feature(env, ARM_FEATURE_EL2) &&
+ arm_is_el2_enabled(env) &&
!(arm_hcr_el2_eff(env) & HCR_APK)) {
return CP_ACCESS_TRAP_EL2;
}