| From | Kamal Mostafa <> | Subject | [PATCH 3.19.y-ckt 006/102] kvm: x86: fix kvm_apic_has_events to check for NULL pointer | Date | Tue, 7 Jul 2015 11:21:56 -0700 |
| |
3.19.8-ckt3 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Bonzini <pbonzini@redhat.com>
commit ce40cd3fc7fa40a6119e5fe6c0f2bc0eb4541009 upstream.
Malicious (or egregiously buggy) userspace can trigger it, but it should never happen in normal operation.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reference: CVE-2015-4692 Signed-off-by: Kamal Mostafa <kamal@canonical.com> --- arch/x86/kvm/lapic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index c674fce..d3d6e92 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -165,7 +165,7 @@ static inline u16 apic_logical_id(struct kvm_apic_map *map, u32 ldr) 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); -- 1.9.1
|