From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH] KVM: Fix NULL pointer reference by update_cr8_intercept() Date: Wed, 19 Aug 2009 11:07:42 +0300 Message-ID: <4A8BB2CE.80006@redhat.com> References: <1250650329-28537-1-git-send-email-sheng@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: arcezed@gmail.com, kvm@vger.kernel.org To: Sheng Yang Return-path: Received: from mx2.redhat.com ([66.187.237.31]:51850 "EHLO mx2.redhat.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751759AbZHSIHp (ORCPT ); Wed, 19 Aug 2009 04:07:45 -0400 In-Reply-To: <1250650329-28537-1-git-send-email-sheng@linux.intel.com> Sender: kvm-owner@vger.kernel.org List-ID: On 08/19/2009 05:52 AM, Sheng Yang wrote: > Commit 0d11419a result in NULL pointer reference when using > --no-kvm-irqchip. > > Signed-off-by: Sheng Yang > --- > arch/x86/kvm/x86.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 850cf56..9ac2d9e 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -4453,7 +4453,8 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, > kvm_set_segment(vcpu,&sregs->tr, VCPU_SREG_TR); > kvm_set_segment(vcpu,&sregs->ldt, VCPU_SREG_LDTR); > > - update_cr8_intercept(vcpu); > + if (kvm_lapic_enabled(vcpu)) > + update_cr8_intercept(vcpu); > > Thanks, I already have a similar fix in update_cr8_intercept() (since it can be called from another callsite as well). Please check kvm-next. -- error compiling committee.c: too many arguments to function