KVM: nSVM: Leave nested if loading CR3 fails at the end of KVM_SET_NESTED_STATE
Sean Christopherson
maintainerPATCH 1/1 KVM: nSVM: Leave nested if loading CR3 fails at the end of KVM_SET_NESTED_STATE
Force the vCPU out of L2 if loading CR3 load at the end of setting nested state fails, otherwise KVM will leave the vCPU in a half-baked state, e.g. with L1's page walker, and if nested NPT is disabled, L1's PGD as well.
--- arch/x86/kvm/svm/nested.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/kvm/svm/nested.c +3 -1
@@ -2114,8 +2114,10 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,*/ ret =nested_svm_load_cr3 (&svm->vcpu, vcpu->arch.cr3,nested_npt_enabled (svm), false); -if (ret) +if (ret) { +svm_leave_nested (vcpu); goto out_free; + } svm->nested.force_msr_bitmap_recalc = true;
base-commit: d21eef2084a9af87ac2a783bc7c2b175ba114e4e
Signature · 1 line
2.56.1.703.gf848ed807c-goog
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 2 potential issues to consider: - [Medium] KVM: nSVM: unrestored vmcb01 save state in svm_set_nested_state() on error - [Medium] KVM: nSVM…
Thank you for your contribution! Sashiko AI review found 2 potential issues to consider:
- [Medium] KVM: nSVM: unrestored vmcb01 save state in svm_set_nested_state() on error
- [Medium] KVM: nSVM: svm_leave_nested() fails to reinitialize MMU context on L2 exit
--
commit 47588b5eb2f39bbca607aca29d4d677254fa60d9
Author: Sean Christopherson <[email protected]>
KVM: nSVM: Leave nested if loading CR3 fails at the end of KVM_SET_NESTED_STATE
This commit calls svm_leave_nested() when nested_svm_load_cr3() fails at the end of svm_set_nested_state().
arch/x86/kvm/svm/nested.c static int svm_set_nested_state(struct kvm_vcpu *vcpu, · line 2120
Quoted 13 lines
arch/x86/kvm/svm/nested.c +3
-1@@ -2114,8 +2114,10 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,*/ ret =nested_svm_load_cr3 (&svm->vcpu, vcpu->arch.cr3,nested_npt_enabled (svm), false); -if (ret) +if (ret) { +svm_leave_nested (vcpu); goto out_free; + }
[Severity: Medium]
Does calling svm_leave_nested() here leave vmcb01.ptr->save and vCPU controls corrupted when nested_svm_load_cr3() fails?
By this point in svm_set_nested_state(), svm_copy_vmrun_state() has already overwritten vmcb01.ptr->save with the raw user-supplied save area without updating vcpu->arch, and nested_vmcb02_prepare_control() has already applied L2 TSC scaling, TSC offset, and virtual NMI state. svm_leave_nested() switches svm->vmcb back to vmcb01 without restoring vmcb01.ptr->save from vmcb02.ptr->save or undoing the control changes, leaving vmcb01's CR0/CR3/CR4/EFER out of sync with vcpu->arch and lacking required shadow-paging bits when NPT is disabled on the host.
Since nested_svm_load_cr3() is called with reload_pdptrs=false, its only failure condition is !kvm_vcpu_is_legal_cr3(vcpu, vcpu->arch.cr3), which could be checked during the validation phase before mutating vCPU state.
[Severity: Medium]
Can svm_leave_nested() leave the vCPU's MMU uninitialized when forcing a vCPU out of L2?
arch/x86/kvm/svm/nested.c:svm_leave_nested() {
...
leave_guest_mode(vcpu);
...
svm_switch_vmcb(svm, &svm->vmcb01);
nested_svm_uninit_mmu_context(vcpu);
}nested_svm_uninit_mmu_context() only sets vcpu->arch.mmu back to &vcpu->arch.root_mmu without calling kvm_init_mmu(). If the vCPU was already in L2 with nested NPT enabled and userspace updates CPUID (such as reducing MAXPHYADDR, which also causes nested_svm_load_cr3() to fail), kvm_mmu_after_set_cpuid() sets root_mmu.root_role.invalid = 1, while kvm_init_mmu() skips reinitializing root_mmu because mmu_is_nested(vcpu) is true.
After svm_leave_nested() exits guest mode without calling kvm_init_mmu(), the vCPU is left in L1 with L2's gva_walk and root_mmu.root_role.invalid still set. On the next KVM_RUN with TDP MMU enabled, kvm_tdp_mmu_alloc_root() allocates a root with role.invalid = 1, triggering KVM_MMU_WARN_ON(!root || root->role.invalid) in kvm_tdp_mmu_map() and leaking the invalid root on VM teardown.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 5 lines · Sean Christopherson
Force the vCPU out of L2 if loading CR3 load at the end of setting nested state fails, otherwise KVM will leave the vCPU in a half-baked state, e.g. with L1's page walker, and if nested NPT is disabled, L1's PGD as well.
Quoted 7 lines
Fixes e1779c2714c3 ("KVM: x86: nSVM: fix potential NULL derefernce on nested migration")Reported-by Stefan Teodorescu <[email protected]>Reported-by Sashiko Bot <[email protected]>Signed-off-by Sean Christopherson <[email protected]>