Commit 80f97c79 authored Jul 27, 2018 by Jim Mattson Committed by Greg Kroah-Hartman Sep 15, 2018

kvm: nVMX: Fix fault vector for VMX operation at CPL > 0



[ Upstream commit 36090bf43a6b835a42f515cb515ff6fa293a25fe ]

The fault that should be raised for a privilege level violation is #GP
rather than #UD.

Fixes: 727ba748e110b4 ("kvm: nVMX: Enforce cpl=0 for VMX instructions")
Signed-off-by: Jim Mattson <jmattson@google.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 1187e018

arch/x86/kvm/vmx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -7590,7 +7590,7 @@ static int handle_vmon(struct kvm_vcpu *vcpu)

		/* CPL=0 must be checked manually. */
		if (vmx_get_cpl(vcpu)) {
		kvm_queue_exception(vcpu, UD_VECTOR);
		kvm_inject_gp(vcpu, 0);
		return 1;
		}

		@@ -7654,7 +7654,7 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
		static int nested_vmx_check_permission(struct kvm_vcpu *vcpu)
		{
		if (vmx_get_cpl(vcpu)) {
		kvm_queue_exception(vcpu, UD_VECTOR);
		kvm_inject_gp(vcpu, 0);
		return 0;
		}