diff mbox series

[D/E/F,1/3] KVM: nVMX: Don't emulate instructions in guest mode

Message ID 20200227185125.650784-10-cascardo@canonical.com
State New
Headers show
Series [D/E/F,1/3] KVM: nVMX: Don't emulate instructions in guest mode | expand

Commit Message

Thadeu Lima de Souza Cascardo Feb. 27, 2020, 6:51 p.m. UTC 
From: Paolo Bonzini <pbonzini@redhat.com>

CVE-2020-2732

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>
(cherry picked from commit 07721feee46b4b248402133228235318199b05ec)
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
---
 arch/x86/kvm/vmx/vmx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index f09a213fd5cb..bc6013e54463 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -7146,7 +7146,7 @@  static int vmx_check_intercept(struct kvm_vcpu *vcpu,
 	}
 
 	/* TODO: check more intercepts... */
-	return X86EMUL_CONTINUE;
+	return X86EMUL_UNHANDLEABLE;
 }
 
 #ifdef CONFIG_X86_64