[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] target/arm: Fix pauth_check_trap vs SEL2
From: |
Rémi Denis-Courmont |
Subject: |
Re: [PATCH] target/arm: Fix pauth_check_trap vs SEL2 |
Date: |
Tue, 15 Mar 2022 17:06:40 +0200 |
Le tiistaina 15. maaliskuuta 2022, 4.12.05 EET Richard Henderson a écrit :
> 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>
> ---
> target/arm/pauth_helper.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c
> index cd6df18150..739aa520dd 100644
> --- a/target/arm/pauth_helper.c
> +++ b/target/arm/pauth_helper.c
> @@ -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)
> {
> - 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);
> bool trap = !(hcr & HCR_API);
> if (el == 0) {
Ack.
--
Rémi Denis-Courmont
http://www.remlab.net/