openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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

Fixes: 727ba748e1 ("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>
This commit is contained in:
Jim Mattson 2018-07-27 09:18:50 -07:00 committed by Paolo Bonzini
parent b9b33da2aa
commit 36090bf43a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kvm/vmx.c
View File

@ -8096,7 +8096,7 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
/* CPL=0 must be checked manually. */ /* CPL=0 must be checked manually. */
if (vmx_get_cpl(vcpu)) { if (vmx_get_cpl(vcpu)) {
kvm_queue_exception(vcpu, UD_VECTOR); kvm_inject_gp(vcpu, 0);
return 1; return 1;
} }
@ -8160,7 +8160,7 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
static int nested_vmx_check_permission(struct kvm_vcpu *vcpu) static int nested_vmx_check_permission(struct kvm_vcpu *vcpu)
{ {
if (vmx_get_cpl(vcpu)) { if (vmx_get_cpl(vcpu)) {
kvm_queue_exception(vcpu, UD_VECTOR); kvm_inject_gp(vcpu, 0);
return 0; return 0;
} }