KVM: x86: Mark nested RSM-created VM-Enter as untrusted
PATCH v2 1/1 KVM: x86: Mark nested RSM-created VM-Enter as untrusted
From: Hao Zhang <[email protected]>
RSM can restore state that indicates the vCPU was running L2 when SMI arrived. KVM then re-enters nested guest mode and marks nested_run_pending so that the next KVM_RUN completes the pending nested transition.
Unlike a normal nested VMLAUNCH/VMRESUME, the state restored by RSM comes from SMRAM. Userspace can modify SMRAM before RSM. The resulting L2 state may require invalid-guest-state emulation. If KVM trusts that pending run, VMX can synthesize EXIT_REASON_INVALID_STATE before hardware VM-Entry completes the pending run and trip the nested_run_pending invariant.
Do not treat an RSM-created pending nested run as KVM-trusted state. Mark the run as KVM_NESTED_RUN_PENDING_UNTRUSTED for both VMX and SVM, matching the existing userspace-modified-state handling in kvm_x86_vcpu_pre_run().
---
Changes in v2:
- Mark nested state restored by RSM from SMRAM as KVM_NESTED_RUN_PENDING_UNTRUSTED.
- Keep the BUG check in __vmx_handle_exit(), but make it apply only to KVM_NESTED_RUN_PENDING.
Link to v1: https://lore.kernel.org/all/[email protected]/
arch/x86/kvm/svm/svm.c | 2 +- arch/x86/kvm/vmx/vmx.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
arch/x86/kvm/svm/svm.c +1 -1
@@ -5096,7 +5096,7 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram) goto unmap_save; ret =0 ; - vcpu->arch.nested_run_pending =KVM_NESTED_RUN_PENDING ; + vcpu->arch.nested_run_pending =KVM_NESTED_RUN_PENDING_UNTRUSTED ; unmap_save:kvm_vcpu_unmap (vcpu, &map_save);
arch/x86/kvm/vmx/vmx.c +3 -2
@@ -6720,7 +6720,8 @@ static int __vmx_handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath)* invalid guest state should never happen as that means KVM knowingly * allowed a nested VM-Enter with an invalid vmcs12. More below. */ -if (KVM_BUG_ON (vcpu->arch.nested_run_pending, vcpu->kvm)) +if (KVM_BUG_ON (vcpu->arch.nested_run_pending ==KVM_NESTED_RUN_PENDING , + vcpu->kvm))return -EIO ;if (is_guest_mode (vcpu)) {
@@ -8436,7 +8437,7 @@ int vmx_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram)if (ret !=NVMX_VMENTRY_SUCCESS )return 1 ; - vcpu->arch.nested_run_pending =KVM_NESTED_RUN_PENDING ; + vcpu->arch.nested_run_pending =KVM_NESTED_RUN_PENDING_UNTRUSTED ; vmx->nested.smm.guest_mode = false; }return 0 ;
base-commit: 58717b2a1365d06c8c64b72aa948541b53fe31eb
Signature · 1 line
2.15.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [High] Leaked `nested_run_pending` flag in VMX permanently blocks event injection to L1 after recovering…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] Leaked nested_run_pending flag in VMX permanently blocks event injection to L1 after recovering from an invalid untrusted nested state. --
--- Patch [1]: [PATCH v2] KVM: x86: Mark nested RSM-created VM-Enter as untrusted --- commit 096beaf30ae7e6e858dddc7bb2b2a980624ad7d1
Author: Hao Zhang <[email protected]>
KVM: x86: Mark nested RSM-created VM-Enter as untrusted
RSM can restore state that indicates the vCPU was running L2 when SMI arrived. KVM then re-enters nested guest mode and marks nested_run_pending so that the next KVM_RUN completes the pending nested transition.
Link to v1: https://lore.kernel.org/all/[email protected]/
Quoted 4 lines
arch/x86/kvm/svm/svm.c +0
-0
[ ... ]
arch/x86/kvm/vmx/vmx.c static int __vmx_handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath) · line 6725
Quoted 12 lines
arch/x86/kvm/vmx/vmx.c +2
-1@@ -6720,7 +6720,8 @@ static int __vmx_handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath)* invalid guest state should never happen as that means KVM knowingly * allowed a nested VM-Enter with an invalid vmcs12. More below. */ -if (KVM_BUG_ON (vcpu->arch.nested_run_pending, vcpu->kvm)) +if (KVM_BUG_ON (vcpu->arch.nested_run_pending ==KVM_NESTED_RUN_PENDING , + vcpu->kvm))return -EIO ;
[Severity: High]
Does this allow the KVM_NESTED_RUN_PENDING_UNTRUSTED flag to leak and lock up the vCPU?
If a malicious L2 guest modifies SMRAM to create an invalid nested state, then executes RSM, vmx_leave_smm() restores this state and sets nested_run_pending to KVM_NESTED_RUN_PENDING_UNTRUSTED.
During vmx_vcpu_run(), the invalid state triggers an early return because of vmx->vt.emulation_required:
if (unlikely(vmx->vt.emulation_required)) {
vmx->fail = 0;
vmx->vt.exit_reason.full = EXIT_REASON_INVALID_STATE;
...
return EXIT_FASTPATH_NONE;
}This skips the code block at the end of vmx_vcpu_run() that normally clears vcpu->arch.nested_run_pending = 0.
When __vmx_handle_exit() is subsequently called, the modified KVM_BUG_ON allows this UNTRUSTED state to fall through without returning -EIO. KVM then reaches this block:
if (vmx->vt.emulation_required) {
nested_vmx_vmexit(vcpu, EXIT_REASON_TRIPLE_FAULT, 0, 0);
return 1;
}This synthesizes a TRIPLE_FAULT and transitions the vCPU back to L1, but it doesn't clear the nested_run_pending flag before doing so.
Once back in L1, vmx_interrupt_allowed() unconditionally returns -EBUSY because the flag is still set:
if (vcpu->arch.nested_run_pending) return -EBUSY;
Will this cause kvm_check_and_inject_events() to constantly request an immediate exit, permanently livelocking the host vCPU thread in an infinite VM-Enter/VM-Exit loop?
Quoted 2 lines
arch/x86/kvm/vmx/vmx.c +0
-0if (is_guest_mode (vcpu)) {
[ ... ]
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Sean Christopherson
maintainerQuoted 24 lines · On Tue, Jul 21, 2026, [email protected] wrote:
Quoted 4 lines
arch/x86/kvm/svm/svm.c +0
-0[ ... ]
arch/x86/kvm/vmx/vmx.c static int __vmx_handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath) · line 6725
Quoted 12 lines
arch/x86/kvm/vmx/vmx.c +2
-1@@ -6720,7 +6720,8 @@ static int __vmx_handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath)* invalid guest state should never happen as that means KVM knowingly * allowed a nested VM-Enter with an invalid vmcs12. More below. */ -if (KVM_BUG_ON (vcpu->arch.nested_run_pending, vcpu->kvm)) +if (KVM_BUG_ON (vcpu->arch.nested_run_pending ==KVM_NESTED_RUN_PENDING , + vcpu->kvm))return -EIO ;[Severity: High]
Does this allow theKVM_NESTED_RUN_PENDING_UNTRUSTEDflag to leak and lock up the vCPU?
Quoted 3 lines
If a malicious L2 guest modifies SMRAM to create an invalid nested state, then executes RSM,
vmx_leave_smm()restores this state and setsnested_run_pendingtoKVM_NESTED_RUN_PENDING_UNTRUSTED.
LOL, that is an impressively convoluted hallucination from Sashiko. SMI is an unconditional VM-Exit on Intel, and KVM doesn't support emulating parallel SMM, i.e. it's impossible for L2 to have access to "live" SMRAM.
That said, leaving nested_run_pending set isn't good, and I missed that my suggested "fix" would require tweaking the above KVM_BUG_ON(). I'll respond to v3 with an alternative solution.