CVE-2014-7842 kvm: reporting emulation failures to userspace (rhbz 1163762 1163767)
This commit is contained in:
parent
2c9cd108a4
commit
da40847e36
|
@ -0,0 +1,37 @@
|
|||
From eeb55bed9ae80e1e860a1451986ce2ee0e5e52a7 Mon Sep 17 00:00:00 2001
|
||||
From: Nadav Amit <namit@cs.technion.ac.il>
|
||||
Date: Wed, 17 Sep 2014 02:50:50 +0300
|
||||
Subject: [PATCH] KVM: x86: Don't report guest userspace emulation error to
|
||||
userspace
|
||||
|
||||
Commit fc3a9157d314 ("KVM: X86: Don't report L2 emulation failures to
|
||||
user-space") disabled the reporting of L2 (nested guest) emulation failures to
|
||||
userspace due to race-condition between a vmexit and the instruction emulator.
|
||||
The same rational applies also to userspace applications that are permitted by
|
||||
the guest OS to access MMIO area or perform PIO.
|
||||
|
||||
This patch extends the current behavior - of injecting a #UD instead of
|
||||
reporting it to userspace - also for guest userspace code.
|
||||
|
||||
Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
---
|
||||
arch/x86/kvm/x86.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
|
||||
index 9d292e8372d6..d6aeccf116fa 100644
|
||||
--- a/arch/x86/kvm/x86.c
|
||||
+++ b/arch/x86/kvm/x86.c
|
||||
@@ -5002,7 +5002,7 @@ static int handle_emulation_failure(struct kvm_vcpu *vcpu)
|
||||
|
||||
++vcpu->stat.insn_emulation_fail;
|
||||
trace_kvm_emulate_insn_failed(vcpu);
|
||||
- if (!is_guest_mode(vcpu)) {
|
||||
+ if (!is_guest_mode(vcpu) && kvm_x86_ops->get_cpl(vcpu) == 0) {
|
||||
vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
|
||||
vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_EMULATION;
|
||||
vcpu->run->internal.ndata = 0;
|
||||
--
|
||||
1.9.3
|
||||
|
|
@ -692,6 +692,9 @@ Patch26066: ahci-disable-MSI-instead-of-NCQ-on-Samsung-pci-e-SSD.patch
|
|||
#CVE-2014-7841 rhbz 1163087 1163095
|
||||
Patch26067: net-sctp-fix-NULL-pointer-dereference-in-af-from_add.patch
|
||||
|
||||
#CVE-2014-7842 rhbz 1163762 1163767
|
||||
Patch26068: KVM-x86-Don-t-report-guest-userspace-emulation-error.patch
|
||||
|
||||
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
|
||||
Patch30000: kernel-arm64.patch
|
||||
|
||||
|
@ -1497,6 +1500,9 @@ ApplyPatch ahci-disable-MSI-instead-of-NCQ-on-Samsung-pci-e-SSD.patch
|
|||
#CVE-2014-7841 rhbz 1163087 1163095
|
||||
ApplyPatch net-sctp-fix-NULL-pointer-dereference-in-af-from_add.patch
|
||||
|
||||
#CVE-2014-7842 rhbz 1163762 1163767
|
||||
ApplyPatch KVM-x86-Don-t-report-guest-userspace-emulation-error.patch
|
||||
|
||||
%if 0%{?aarch64patches}
|
||||
ApplyPatch kernel-arm64.patch
|
||||
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
|
||||
|
@ -2365,6 +2371,9 @@ fi
|
|||
# ||----w |
|
||||
# || ||
|
||||
%changelog
|
||||
* Thu Nov 13 2014 Josh Boyer <jwboyer@fedoraproject.org>
|
||||
- CVE-2014-7842 kvm: reporting emulation failures to userspace (rhbz 1163762 1163767)
|
||||
|
||||
* Wed Nov 12 2014 Josh Boyer <jwboyer@fedoraproject.org>
|
||||
- CVE-2014-7841 sctp: NULL ptr deref on malformed packet (rhbz 1163087 1163095)
|
||||
|
||||
|
|
Loading…
Reference in New Issue