public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Andrew Scull <ascull@google.com>
Cc: kvmarm@lists.cs.columbia.edu, maz@kernel.org,
	kernel-team@android.com, stable@vger.kernel.org
Subject: Re: [PATCH] KVM: arm64: Fix nVHE hyp panic host context restore
Date: Mon, 15 Mar 2021 13:38:42 +0100	[thread overview]
Message-ID: <YE9VUpzspfRD24fV@kroah.com> (raw)
In-Reply-To: <20210315122136.1687370-1-ascull@google.com>

On Mon, Mar 15, 2021 at 12:21:36PM +0000, Andrew Scull wrote:
> Commit c4b000c3928d4f20acef79dccf3a65ae3795e0b0 upstream.
> 
> When panicking from the nVHE hyp and restoring the host context, x29 is
> expected to hold a pointer to the host context. This wasn't being done
> so fix it to make sure there's a valid pointer the host context being
> used.
> 
> Rather than passing a boolean indicating whether or not the host context
> should be restored, instead pass the pointer to the host context. NULL
> is passed to indicate that no context should be restored.
> 
> Fixes: a2e102e20fd6 ("KVM: arm64: nVHE: Handle hyp panics")
> Cc: stable@vger.kernel.org # 5.11.y only
> Signed-off-by: Andrew Scull <ascull@google.com>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> Link: https://lore.kernel.org/r/20210219122406.1337626-1-ascull@google.com
> ---
>  arch/arm64/include/asm/kvm_hyp.h |  3 ++-
>  arch/arm64/kvm/hyp/nvhe/host.S   | 20 ++++++++++----------
>  arch/arm64/kvm/hyp/nvhe/switch.c |  3 +--
>  3 files changed, 13 insertions(+), 13 deletions(-)

Both backports now queued up, thanks.

greg k-h

  reply	other threads:[~2021-03-15 12:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-15 12:21 [PATCH] KVM: arm64: Fix nVHE hyp panic host context restore Andrew Scull
2021-03-15 12:38 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-03-15 12:22 Andrew Scull

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=YE9VUpzspfRD24fV@kroah.com \
    --to=greg@kroah.com \
    --cc=ascull@google.com \
    --cc=kernel-team@android.com \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=maz@kernel.org \
    --cc=stable@vger.kernel.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