Skip to content

Commit 405fce6

Browse files
committed
KVM: SVM: Filter out 64-bit exit codes when invoking exit handlers on bare metal
Explicitly filter out 64-bit exit codes when invoking exit handlers, as svm_exit_handlers[] will never be sized with entries that use bits 63:32. Processing the non-failing exit code as a 32-bit value will allow tracking exit_code as a single 64-bit value (which it is, architecturally). This will also allow hardening KVM against Spectre-like attacks without needing to do silly things to avoid build failures on 32-bit kernels (array_index_nospec() rightly asserts that the index fits in an "unsigned long"). Omit the check when running as a VM, as KVM has historically failed to set bits 63:32 appropriately when synthesizing VM-Exits, i.e. KVM could get false positives when running as a VM on an older, broken KVM/kernel. From a functional perspective, omitting the check is "fine", as any unwanted collision between e.g. VMEXIT_INVALID and a 32-bit exit code will be fatal to KVM-on-KVM regardless of what KVM-as-L1 does. Reviewed-by: Yosry Ahmed <yosry.ahmed@linux.dev> Link: https://patch.msgid.link/20251230211347.4099600-5-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 194c17b commit 405fce6

1 file changed

Lines changed: 16 additions & 2 deletions

File tree

arch/x86/kvm/svm/svm.c

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3467,8 +3467,22 @@ static void dump_vmcb(struct kvm_vcpu *vcpu)
34673467
sev_free_decrypted_vmsa(vcpu, save);
34683468
}
34693469

3470-
int svm_invoke_exit_handler(struct kvm_vcpu *vcpu, u64 exit_code)
3470+
int svm_invoke_exit_handler(struct kvm_vcpu *vcpu, u64 __exit_code)
34713471
{
3472+
u32 exit_code = __exit_code;
3473+
3474+
/*
3475+
* SVM uses negative values, i.e. 64-bit values, to indicate that VMRUN
3476+
* failed. Report all such errors to userspace (note, VMEXIT_INVALID,
3477+
* a.k.a. SVM_EXIT_ERR, is special cased by svm_handle_exit()). Skip
3478+
* the check when running as a VM, as KVM has historically left garbage
3479+
* in bits 63:32, i.e. running KVM-on-KVM would hit false positives if
3480+
* the underlying kernel is buggy.
3481+
*/
3482+
if (!cpu_feature_enabled(X86_FEATURE_HYPERVISOR) &&
3483+
(u64)exit_code != __exit_code)
3484+
goto unexpected_vmexit;
3485+
34723486
#ifdef CONFIG_MITIGATION_RETPOLINE
34733487
if (exit_code == SVM_EXIT_MSR)
34743488
return msr_interception(vcpu);
@@ -3495,7 +3509,7 @@ int svm_invoke_exit_handler(struct kvm_vcpu *vcpu, u64 exit_code)
34953509

34963510
unexpected_vmexit:
34973511
dump_vmcb(vcpu);
3498-
kvm_prepare_unexpected_reason_exit(vcpu, exit_code);
3512+
kvm_prepare_unexpected_reason_exit(vcpu, __exit_code);
34993513
return 0;
35003514
}
35013515

0 commit comments

Comments
 (0)