qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Rémi Denis-Courmont" <remi@remlab.net>
To: qemu-devel@nongnu.org, qemu-arm@nongnu.org,
	Richard Henderson <richard.henderson@linaro.org>
Subject: Re: [PATCH] target/arm: Fix pauth_check_trap vs SEL2
Date: Tue, 15 Mar 2022 17:06:40 +0200	[thread overview]
Message-ID: <2620199.mvXUDI8C0e@basile.remlab.net> (raw)
In-Reply-To: <20220315021205.342768-1-richard.henderson@linaro.org>

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/





  parent reply	other threads:[~2022-03-15 15:07 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-15  2:12 [PATCH] target/arm: Fix pauth_check_trap vs SEL2 Richard Henderson
2022-03-15 11:01 ` Philippe Mathieu-Daudé
2022-03-15 15:06 ` Rémi Denis-Courmont [this message]
2022-03-15 18:04 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2620199.mvXUDI8C0e@basile.remlab.net \
    --to=remi@remlab.net \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).