From: Greg Kroah-Hartman Date: Fri, 14 Aug 2015 17:03:16 +0000 (-0700) Subject: 3.10-stable patches X-Git-Tag: v3.10.87~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63bb34651c587103ffe6099d5ccc0dafee32133a;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: kvm-x86-fix-kvm_apic_has_events-to-check-for-null-pointer.patch --- diff --git a/queue-3.10/kvm-x86-fix-kvm_apic_has_events-to-check-for-null-pointer.patch b/queue-3.10/kvm-x86-fix-kvm_apic_has_events-to-check-for-null-pointer.patch new file mode 100644 index 00000000000..e2648262049 --- /dev/null +++ b/queue-3.10/kvm-x86-fix-kvm_apic_has_events-to-check-for-null-pointer.patch @@ -0,0 +1,31 @@ +From ce40cd3fc7fa40a6119e5fe6c0f2bc0eb4541009 Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Sat, 30 May 2015 14:31:24 +0200 +Subject: kvm: x86: fix kvm_apic_has_events to check for NULL pointer + +From: Paolo Bonzini + +commit ce40cd3fc7fa40a6119e5fe6c0f2bc0eb4541009 upstream. + +Malicious (or egregiously buggy) userspace can trigger it, but it +should never happen in normal operation. + +Signed-off-by: Paolo Bonzini +Signed-off-by: Wang Kai +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kvm/lapic.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/x86/kvm/lapic.h ++++ b/arch/x86/kvm/lapic.h +@@ -165,7 +165,7 @@ static inline u16 apic_logical_id(struct + + static inline bool kvm_apic_has_events(struct kvm_vcpu *vcpu) + { +- return vcpu->arch.apic->pending_events; ++ return kvm_vcpu_has_lapic(vcpu) && vcpu->arch.apic->pending_events; + } + + bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector); diff --git a/queue-3.10/series b/queue-3.10/series index 9f52b817045..f531780bd98 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -30,3 +30,4 @@ arm-7819-1-fiq-cast-the-first-argument-of-flush_icache_range.patch signalfd-fix-information-leak-in-signalfd_copyinfo.patch signal-fix-information-leak-in-copy_siginfo_to_user.patch signal-fix-information-leak-in-copy_siginfo_from_user32.patch +kvm-x86-fix-kvm_apic_has_events-to-check-for-null-pointer.patch