From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:43927 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752958AbbG2ITW (ORCPT ); Wed, 29 Jul 2015 04:19:22 -0400 Subject: Re: [PATCH] kvm: x86: fix kvm_apic_has_events to check for NULL pointer To: Wang Kai , gregkh@linuxfoundation.org References: <1438145794-187789-1-git-send-email-morgan.wang@huawei.com> <1438145794-187789-2-git-send-email-morgan.wang@huawei.com> Cc: stable@vger.kernel.org From: Paolo Bonzini Message-ID: <55B88C84.6060103@redhat.com> Date: Wed, 29 Jul 2015 10:19:16 +0200 MIME-Version: 1.0 In-Reply-To: <1438145794-187789-2-git-send-email-morgan.wang@huawei.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org List-ID: On 29/07/2015 06:56, Wang Kai wrote: > From: Paolo Bonzini > > commit ce40cd3fc7fa40a6119e5fe6c0f2bc0eb4541009 upstream. > > Malicious (or egregiously buggy) userspace can trigger it, but it > should never happen in normal operation. > > Signed-off-by: Paolo Bonzini > [wangkai: backport to 3.10: adjust context] > Signed-off-by: Wang Kai > --- > arch/x86/kvm/lapic.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h > index c8b0d0d..fc87568 100644 > --- a/arch/x86/kvm/lapic.h > +++ b/arch/x86/kvm/lapic.h > @@ -165,7 +165,7 @@ static inline u16 apic_logical_id(struct kvm_apic_map *map, u32 ldr) > > 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); > Ack. Paolo