Message ID | 20220517145242.1215271-1-florian.lugou@provenrun.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | target/arm: Fix PAuth keys access checks for disabled SEL2 | expand |
On 5/17/22 07:52, Florian Lugou wrote: > 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> > --- > target/arm/helper.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On Tue, 17 May 2022 at 15:53, Florian Lugou <florian.lugou@provenrun.com> wrote: > > 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> > --- > target/arm/helper.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
diff --git a/target/arm/helper.c b/target/arm/helper.c index 432bd81919..29f73c7343 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6758,7 +6758,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; }
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> --- target/arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)