Skip to content

Commit 2f6a49b

Browse files
committed
KVM: arm64: Kill 32-bit vCPUs on systems with mismatched EL0 support
If a vCPU is caught running 32-bit code on a system with mismatched support at EL0, then we should kill it. Acked-by: Marc Zyngier <maz@kernel.org> Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> Link: https://lore.kernel.org/r/20210608180313.11502-4-will@kernel.org Signed-off-by: Will Deacon <will@kernel.org>
1 parent 2122a83 commit 2f6a49b

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

arch/arm64/kvm/arm.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,15 @@ static void check_vcpu_requests(struct kvm_vcpu *vcpu)
692692
}
693693
}
694694

695+
static bool vcpu_mode_is_bad_32bit(struct kvm_vcpu *vcpu)
696+
{
697+
if (likely(!vcpu_mode_is_32bit(vcpu)))
698+
return false;
699+
700+
return !system_supports_32bit_el0() ||
701+
static_branch_unlikely(&arm64_mismatched_32bit_el0);
702+
}
703+
695704
/**
696705
* kvm_arch_vcpu_ioctl_run - the main VCPU run function to execute guest code
697706
* @vcpu: The VCPU pointer
@@ -875,7 +884,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
875884
* with the asymmetric AArch32 case), return to userspace with
876885
* a fatal error.
877886
*/
878-
if (!system_supports_32bit_el0() && vcpu_mode_is_32bit(vcpu)) {
887+
if (vcpu_mode_is_bad_32bit(vcpu)) {
879888
/*
880889
* As we have caught the guest red-handed, decide that
881890
* it isn't fit for purpose anymore by making the vcpu

0 commit comments

Comments
 (0)