summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-02-05 02:26:29 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-02-28 19:22:22 +0300
commit24dfae91a23a55c9f4cbe8fd778ed229ee9cced1 (patch)
tree64c6afde0e579d6d6239a06f2597177f9df86e45
parente61c236dcf3416211008774b6c2bfa01753a82c1 (diff)
downloadlinux-24dfae91a23a55c9f4cbe8fd778ed229ee9cced1.tar.xz
KVM: nVMX: Don't emulate instructions in guest mode
commit 07721feee46b4b248402133228235318199b05ec upstream. vmx_check_intercept is not yet fully implemented. To avoid emulating instructions disallowed by the L1 hypervisor, refuse to emulate instructions by default. Cc: stable@vger.kernel.org [Made commit, added commit msg - Oliver] Signed-off-by: Oliver Upton <oupton@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/x86/kvm/vmx/vmx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 84b57b461ad6..ee747890bbd6 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -7151,7 +7151,7 @@ static int vmx_check_intercept(struct kvm_vcpu *vcpu,
}
/* TODO: check more intercepts... */
- return X86EMUL_CONTINUE;
+ return X86EMUL_UNHANDLEABLE;
}
#ifdef CONFIG_X86_64