97d8c53
From: Paolo Bonzini <pbonzini@redhat.com>
97d8c53
Date: Thu, 4 Jun 2015 10:18:22 +0200
97d8c53
Subject: [PATCH] kvm: x86: fix kvm_apic_has_events to check for NULL pointer
97d8c53
97d8c53
Malicious (or egregiously buggy) userspace can trigger it, but it
97d8c53
should never happen in normal operation.
97d8c53
97d8c53
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
97d8c53
---
97d8c53
 arch/x86/kvm/lapic.h | 2 +-
97d8c53
 1 file changed, 1 insertion(+), 1 deletion(-)
97d8c53
97d8c53
diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
97d8c53
index 0bc6c656625b..ca4f92d56e16 100644
97d8c53
--- a/arch/x86/kvm/lapic.h
97d8c53
+++ b/arch/x86/kvm/lapic.h
97d8c53
@@ -165,7 +165,7 @@ static inline u16 apic_logical_id(struct kvm_apic_map *map, u32 ldr)
97d8c53
 
97d8c53
 static inline bool kvm_apic_has_events(struct kvm_vcpu *vcpu)
97d8c53
 {
97d8c53
-	return vcpu->arch.apic->pending_events;
97d8c53
+	return kvm_vcpu_has_lapic(vcpu) && vcpu->arch.apic->pending_events;
97d8c53
 }
97d8c53
 
97d8c53
 bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector);