KVM: arm64: Use shadow SPSR_EL1 when injecting exceptions on !VHE
authorMarc Zyngier <maz@kernel.org>
Fri, 21 Jan 2022 18:42:07 +0000 (18:42 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 1 Feb 2022 16:26:59 +0000 (17:26 +0100)
commita3aa4850b37b1bc61014080a87864d0ff7beebd3
treecbe84c8db8f5f3cd8903ba02196581d5b6495d8d
parentd9505958e1eecaa264c3bb352080d885dbbb031f
KVM: arm64: Use shadow SPSR_EL1 when injecting exceptions on !VHE

commit 278583055a237270fac70518275ba877bf9e4013 upstream.

Injecting an exception into a guest with non-VHE is risky business.
Instead of writing in the shadow register for the switch code to
restore it, we override the CPU register instead. Which gets
overriden a few instructions later by said restore code.

The result is that although the guest correctly gets the exception,
it will return to the original context in some random state,
depending on what was there the first place... Boo.

Fix the issue by writing to the shadow register. The original code
is absolutely fine on VHE, as the state is already loaded, and writing
to the shadow register in that case would actually be a bug.

Fixes: bb666c472ca2 ("KVM: arm64: Inject AArch64 exceptions from HYP")
Cc: stable@vger.kernel.org
Signed-off-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Fuad Tabba <tabba@google.com>
Link: https://lore.kernel.org/r/20220121184207.423426-1-maz@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm64/kvm/hyp/exception.c