diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-05-30 15:31:24 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-06-04 11:16:17 +0300 |
| commit | ce40cd3fc7fa40a6119e5fe6c0f2bc0eb4541009 (patch) | |
| tree | 346441e01c7eda7cee7a630a51c81cf0c9ba7c5c /arch/x86/kvm/lapic.h | |
| parent | e194bbdf362ba7d53cfd23ba24f1a7c90ef69a74 (diff) | |
| download | linux-ce40cd3fc7fa40a6119e5fe6c0f2bc0eb4541009.tar.xz | |
kvm: x86: fix kvm_apic_has_events to check for NULL pointer
Malicious (or egregiously buggy) userspace can trigger it, but it
should never happen in normal operation.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/lapic.h')
| -rw-r--r-- | arch/x86/kvm/lapic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index 71b150cae5f9..9d8fcde52027 100644 --- 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) |