From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 4 Feb 2020 23:26:29 +0000 (-0800)
Subject: KVM: nVMX: Don't emulate instructions in guest mode
X-Git-Tag: v5.4.23~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24dfae91a23a55c9f4cbe8fd778ed229ee9cced1;p=thirdparty%2Fkernel%2Fstable.git

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>
---

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 84b57b461ad6b..ee747890bbd60 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