From: Paolo Bonzini Date: Sat, 30 May 2015 12:31:24 +0000 (+0200) Subject: kvm: x86: fix kvm_apic_has_events to check for NULL pointer X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ce40cd3fc7fa40a6119e5fe6c0f2bc0eb4541009;p=linux-beck.git kvm: x86: fix kvm_apic_has_events to check for NULL pointer Malicious (or egregiously buggy) userspace can trigger it, but it should never happen in normal operation. Signed-off-by: Paolo Bonzini --- diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index 71b150cae5f9..9d8fcde52027 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -150,7 +150,7 @@ static inline bool kvm_apic_vid_enabled(struct kvm *kvm) 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; } static inline bool kvm_lowest_prio_delivery(struct kvm_lapic_irq *irq)