kvm: x86: fix kvm_apic_has_events to check for NULL pointer

bonzini · bonzini · commit ce40cd3fc7fa · 2015-06-04T10:16:17.000+02:00
Malicious (or egregiously buggy) userspace can trigger it, but it
should never happen in normal operation.

Signed-off-by: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ static inline bool kvm_apic_vid_enabled(struct kvm *kvm)`
`150`	`150`
`151`	`151`	`static inline bool kvm_apic_has_events(struct kvm_vcpu *vcpu)`
`152`	`152`	`{`
`153`		`- return vcpu->arch.apic->pending_events;`
	`153`	`+ return kvm_vcpu_has_lapic(vcpu) && vcpu->arch.apic->pending_events;`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`static inline bool kvm_lowest_prio_delivery(struct kvm_lapic_irq *irq)`