Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755512AbbFLOK4 (ORCPT ); Fri, 12 Jun 2015 10:10:56 -0400 Received: from mail-ig0-f177.google.com ([209.85.213.177]:38515 "EHLO mail-ig0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755477AbbFLOKv (ORCPT ); Fri, 12 Jun 2015 10:10:51 -0400 MIME-Version: 1.0 In-Reply-To: <1433405902-2651-1-git-send-email-pbonzini@redhat.com> References: <1433405902-2651-1-git-send-email-pbonzini@redhat.com> Date: Fri, 12 Jun 2015 10:10:50 -0400 X-Google-Sender-Auth: _pO9dXr7v-39au1jIlaxU5JTKa4 Message-ID: Subject: Re: [PATCH] kvm: x86: fix kvm_apic_has_events to check for NULL pointer From: Josh Boyer To: Paolo Bonzini Cc: "Linux-Kernel@Vger. Kernel. Org" , KVM list , Petr Matousek Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1436 Lines: 40 On Thu, Jun 4, 2015 at 4:18 AM, Paolo Bonzini wrote: > Malicious (or egregiously buggy) userspace can trigger it, but it > should never happen in normal operation. > > Signed-off-by: Paolo Bonzini This should probably be backported to the stable trees, right? josh > --- > 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 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) > -- > 1.8.3.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/