Commit 7560e333 authored Jul 21, 2019 by Jan Kiszka Committed by Greg Kroah-Hartman Jul 28, 2019

KVM: nVMX: Clear pending KVM_REQ_GET_VMCS12_PAGES when leaving nested



commit cf64527bb33f6cec2ed50f89182fc4688d0056b6 upstream.

Letting this pend may cause nested_get_vmcs12_pages to run against an
invalid state, corrupting the effective vmcs of L1.

This was triggerable in QEMU after a guest corruption in L2, followed by
a L1 reset.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Liran Alon <liran.alon@oracle.com>
Cc: stable@vger.kernel.org
Fixes: 7f7f1ba3 ("KVM: x86: do not load vmcs12 pages while still in SMM")
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 967bc679

arch/x86/kvm/vmx.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -8490,6 +8490,8 @@ static void free_nested(struct vcpu_vmx *vmx)
		if (!vmx->nested.vmxon && !vmx->nested.smm.vmxon)
		return;

		kvm_clear_request(KVM_REQ_GET_VMCS12_PAGES, &vmx->vcpu);

		hrtimer_cancel(&vmx->nested.preemption_timer);
		vmx->nested.vmxon = false;
		vmx->nested.smm.vmxon = false;