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@xxxxxxxxxxxxxxx # 5.11.y only
> Signed-off-by: Andrew Scull <ascull@xxxxxxxxxx>
> Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx>
> Link: https://lore.kernel.org/r/20210219122406.1337626-1-ascull@xxxxxxxxxx
> ---
> 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
