36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Tue, 4 Feb 2020 15:26:29 -0800
|
|
Subject: KVM: nVMX: Don't emulate instructions in guest mode
|
|
Origin: https://git.kernel.org/linus/07721feee46b4b248402133228235318199b05ec
|
|
Bug-Debian-Security: https://security-tracker.debian.org/tracker/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>
|
|
[Salvatore Bonaccorso: Backport to 4.19: Adjust filename to arch/x86/kvm/vmx.c]
|
|
---
|
|
arch/x86/kvm/vmx/vmx.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
|
|
index dcca514ffd42..5801a86f9c24 100644
|
|
--- a/arch/x86/kvm/vmx.c
|
|
+++ b/arch/x86/kvm/vmx.c
|
|
@@ -7164,7 +7164,7 @@ static int vmx_check_intercept(struct kvm_vcpu *vcpu,
|
|
}
|
|
|
|
/* TODO: check more intercepts... */
|
|
- return X86EMUL_CONTINUE;
|
|
+ return X86EMUL_UNHANDLEABLE;
|
|
}
|
|
|
|
#ifdef CONFIG_X86_64
|
|
--
|
|
2.26.2
|
|
|