Commit e49fcb8b authored by Jim Mattson's avatar Jim Mattson Committed by Paolo Bonzini

kvm: nVMX: Fix fault priority for VMX operations

When checking emulated VMX instructions for faults, the #UD for "IF
(not in VMX operation)" should take precedence over the #GP for "ELSIF
CPL > 0."
Suggested-by: default avatarEric Northup <digitaleric@google.com>
Signed-off-by: default avatarJim Mattson <jmattson@google.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 36090bf4
...@@ -8159,15 +8159,16 @@ static int handle_vmon(struct kvm_vcpu *vcpu) ...@@ -8159,15 +8159,16 @@ 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 (!to_vmx(vcpu)->nested.vmxon) {
kvm_inject_gp(vcpu, 0); kvm_queue_exception(vcpu, UD_VECTOR);
return 0; return 0;
} }
if (!to_vmx(vcpu)->nested.vmxon) { if (vmx_get_cpl(vcpu)) {
kvm_queue_exception(vcpu, UD_VECTOR); kvm_inject_gp(vcpu, 0);
return 0; return 0;
} }
return 1; return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment