25 lines
831 B
Diff
25 lines
831 B
Diff
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Sat, 30 May 2015 14:31:24 +0200
|
|
Subject: kvm: x86: fix kvm_apic_has_events to check for NULL pointer
|
|
Origin: https://git.kernel.org/linus/ce40cd3fc7fa40a6119e5fe6c0f2bc0eb4541009
|
|
|
|
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 | 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);
|