Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21e7fbe7 authored by Jim Mattson's avatar Jim Mattson Committed by Radim Krčmář
Browse files

kvm: nVMX: Reorder error checks for emulated VMXON 



Checks on the operand to VMXON are performed after the check for
legacy mode operation and the #GP checks, according to the pseudo-code
in Intel's SDM.

Signed-off-by: default avatarJim Mattson <jmattson@google.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent 4d82d12b

arch/x86/kvm/vmx.c

+3 −3
Original line number Diff line number Diff line
@@ -7180,9 +7180,6 @@ static int handle_vmon(struct kvm_vcpu *vcpu) 
		return 1;

	}



	if (nested_vmx_check_vmptr(vcpu, EXIT_REASON_VMON, NULL))

		return 1;



	if (vmx->nested.vmxon) {

		nested_vmx_failValid(vcpu, VMXERR_VMXON_IN_VMX_ROOT_OPERATION);

		return kvm_skip_emulated_instruction(vcpu);
@@ -7194,6 +7191,9 @@ static int handle_vmon(struct kvm_vcpu *vcpu) 
		return 1;

	}



	if (nested_vmx_check_vmptr(vcpu, EXIT_REASON_VMON, NULL))

		return 1;



	if (cpu_has_vmx_msr_bitmap()) {

		vmx->nested.msr_bitmap =

				(unsigned long *)__get_free_page(GFP_KERNEL);