diff options
| author | Jim Mattson | 2018-07-27 22:44:45 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2018-08-06 17:59:09 +0200 |
| commit | e49fcb8b9ef26dfb2d02b173d790e1ef41177121 (patch) | |
| tree | ae7491b29cb6d6eb03afc423a440dcae31e38156 /arch/x86/kvm/vmx.c | |
| parent | kvm: nVMX: Fix fault vector for VMX operation at CPL > 0 (diff) | |
| download | kernel-qcow2-linux-e49fcb8b9ef26dfb2d02b173d790e1ef41177121.tar.gz kernel-qcow2-linux-e49fcb8b9ef26dfb2d02b173d790e1ef41177121.tar.xz kernel-qcow2-linux-e49fcb8b9ef26dfb2d02b173d790e1ef41177121.zip | |
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: Eric Northup <digitaleric@google.com>
Signed-off-by: Jim Mattson <jmattson@google.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index d19bb602ff07..ccc9d75124a6 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -8159,15 +8159,16 @@ static int handle_vmon(struct kvm_vcpu *vcpu) */ static int nested_vmx_check_permission(struct kvm_vcpu *vcpu) { - if (vmx_get_cpl(vcpu)) { - kvm_inject_gp(vcpu, 0); + if (!to_vmx(vcpu)->nested.vmxon) { + kvm_queue_exception(vcpu, UD_VECTOR); return 0; } - if (!to_vmx(vcpu)->nested.vmxon) { - kvm_queue_exception(vcpu, UD_VECTOR); + if (vmx_get_cpl(vcpu)) { + kvm_inject_gp(vcpu, 0); return 0; } + return 1; } |