kvm: x86: fix kvm_apic_has_events to check for NULL pointer
authorPaolo Bonzini <pbonzini@redhat.com>
Sat, 30 May 2015 12:31:24 +0000 (14:31 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 4 Jun 2015 08:16:17 +0000 (10:16 +0200)
Malicious (or egregiously buggy) userspace can trigger it, but it
should never happen in normal operation.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/lapic.h

index 71b150cae5f95f42d337057b9b7ed164a58d35ad..9d8fcde52027123fe867559b7deff5ffd67bc080 100644 (file)
@@ -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)