Skip to content

nSVM: fix L0 crash if L2 has shutdown condtion which L1 doesn't intercept

Maxim Levitsky kvm lkml stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest4 patches 2 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4KVM: x86: nSVM: leave nested mode on vCPU freearch/x86/kvm/svm/svm.c+1 -00 replies
2/4KVM: x86: nSVM: harden svm_free_nested against freeing vmcb02 while still in usearch/x86/kvm/svm/nested.c+3 -00 replies
3/4KVM: x86: add kvm_leave_nestedarch/x86/kvm/svm/nested.c arch/x86/kvm/vmx/nested.c arch/x86/kvm/x86.c+7 -70 replies
4/4KVM: x86: forcibly leave nested mode on vCPU resetarch/x86/kvm/x86.c+1 -02 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/4] nSVM: fix L0 crash if L2 has shutdown condtion which L1 doesn't intercept

Recently while trying to fix some unit tests I found another CVE in SVM nested code.

In 'shutdown_interception' vmexit handler we call kvm_vcpu_reset.

However if running nested and L1 doesn't intercept shutdown, we will still end up running this function and trigger a bug in it.

The bug is that this function resets the 'vcpu->arch.hflags' without properly leaving the nested state, which leaves the vCPU in inconsistent state, which later triggers a kernel panic in SVM code.

The same bug can likely be triggered by sending INIT via local apic to a vCPU which runs a nested guest.

On VMX we are lucky that the issue can't happen because VMX always intercepts triple faults, thus triple fault in L2 will always be redirected to L1. Plus the 'handle_triple_fault' of VMX doesn't reset the vCPU.

INIT IPI can't happen on VMX either because INIT events are masked while in VMX mode.

Best regards,
Maxim Levitsky

Maxim Levitsky (4):
KVM: x86: nSVM: leave nested mode on vCPU free
KVM: x86: nSVM: harden svm_free_nested against freeing vmcb02 while
still in use
KVM: x86: add kvm_leave_nested
KVM: x86: forcibly leave nested mode on vCPU reset

 arch/x86/kvm/svm/nested.c | 6 +++---
 arch/x86/kvm/svm/svm.c    | 1 +
 arch/x86/kvm/vmx/nested.c | 3 ---
 arch/x86/kvm/x86.c        | 9 ++++++++-
 4 files changed, 12 insertions(+), 7 deletions(-)
Signature · 1 line
2.26.3