4.14-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Jim Mattson <jmatt...@google.com>

[ 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 <jmatt...@google.com>
Reviewed-by: David Hildenbrand <da...@redhat.com>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 arch/x86/kvm/vmx.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -7590,7 +7590,7 @@ static int handle_vmon(struct kvm_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 *
 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;
        }
 


Reply via email to