[PATCH 3.10 33/35] kvm: x86: fix kvm_apic_has_events to check for NULL pointer

From: Greg Kroah-Hartman
Date: Fri Aug 14 2015 - 14:11:10 EST

3.10-stable review patch. If anyone has any objections, please let me know.


From: Paolo Bonzini <pbonzini@xxxxxxxxxx>

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@xxxxxxxxxx>
Signed-off-by: Wang Kai <morgan.wang@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

arch/x86/kvm/lapic.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/x86/kvm/lapic.h
+++ b/arch/x86/kvm/lapic.h
@@ -165,7 +165,7 @@ static inline u16 apic_logical_id(struct

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);

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/