Commit 332d0797 authored by Aaron Lewis's avatar Aaron Lewis Committed by Paolo Bonzini
Browse files

KVM: nVMX: KVM_SET_NESTED_STATE - Tear down old EVMCS state before setting new state 



Move call to nested_enable_evmcs until after free_nested() is complete.

Signed-off-by: default avatarAaron Lewis <aaronlewis@google.com>
Reviewed-by: default avatarMarc Orr <marcorr@google.com>
Reviewed-by: default avatarPeter Shier <pshier@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4b350aeb

arch/x86/kvm/vmx/nested.c

+3 −3
Original line number Diff line number Diff line
@@ -5333,9 +5333,6 @@ static int vmx_set_nested_state(struct kvm_vcpu *vcpu, 
	if (kvm_state->format != 0)

		return -EINVAL;



	if (kvm_state->flags & KVM_STATE_NESTED_EVMCS)

		nested_enable_evmcs(vcpu, NULL);



	if (!nested_vmx_allowed(vcpu))

		return kvm_state->vmx.vmxon_pa == -1ull ? 0 : -EINVAL;
@@ -5377,6 +5374,9 @@ static int vmx_set_nested_state(struct kvm_vcpu *vcpu, 
	if (kvm_state->vmx.vmxon_pa == -1ull)

		return 0;



	if (kvm_state->flags & KVM_STATE_NESTED_EVMCS)

		nested_enable_evmcs(vcpu, NULL);



	vmx->nested.vmxon_ptr = kvm_state->vmx.vmxon_pa;

	ret = enter_vmx_operation(vcpu);

	if (ret)

CRA Git | Maintained and supported by SUSTech CRA and CCSE