Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3F25C43218 for ; Fri, 26 Apr 2019 03:16:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CD1F420673 for ; Fri, 26 Apr 2019 03:16:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="SUtmKRhu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726229AbfDZDQG (ORCPT ); Thu, 25 Apr 2019 23:16:06 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:40910 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726006AbfDZDQG (ORCPT ); Thu, 25 Apr 2019 23:16:06 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x3Q38j0u187516; Fri, 26 Apr 2019 03:15:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2018-07-02; bh=zM4HejCsODoSmuH0uio8LusKvAvGNbF/iGjQBriPd9c=; b=SUtmKRhuq0w+GF48FBG6v7wjCrVDhU3caIzmfQV+8BpL9kIXCcm+oaGF6ZU+xXZPM289 aFi2BCs6jsHR5oxT3oQtkfiYZKBIp8yXDTJjb8Z7NZuO+QbPLL7io2krvDkLsNobVMuQ k4UcZn0ze6zUoKPfOg1Vf5+s7adnPxChLBM8PffMbYzOPtQjLMaOLOoCkoxpraumGgek CzeB3qU1itl9jSiRRon0W+MQxAsETPIb6cGlnzqRnZ6PczZt2YDFEIWYuWQyw+blMpVw JgBdNPCFjt4zcDfjGaL9KY+m2k1K5p1N6PpNhU0fsG7J0oFCRtHB5vZfKiUUIjuOELKq Eg== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2130.oracle.com with ESMTP id 2ryrxdbxjp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 26 Apr 2019 03:15:42 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x3Q3Eq9q104904; Fri, 26 Apr 2019 03:15:41 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userp3020.oracle.com with ESMTP id 2s0dwft1rd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 26 Apr 2019 03:15:41 +0000 Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x3Q3FdeP010958; Fri, 26 Apr 2019 03:15:40 GMT Received: from char.us.oracle.com (/10.152.32.25) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 25 Apr 2019 20:15:39 -0700 Received: by char.us.oracle.com (Postfix, from userid 1000) id 79BC26A00FF; Thu, 25 Apr 2019 23:15:43 -0400 (EDT) Date: Thu, 25 Apr 2019 23:15:43 -0400 From: Konrad Rzeszutek Wilk To: Sean Christopherson Cc: Paolo Bonzini , Radim =?utf-8?B?S3LEjW3DocWZ?= , kvm@vger.kernel.org, syzbot+f7e65445a40d3e0e4ebf@syzkaller.appspotmail.com Subject: Re: [PATCH] KVM: lapic: Check for in-kernel LAPIC before deferencing apic pointer Message-ID: <20190426031543.GB22801@char.us.oracle.com> References: <20190426020109.32319-1-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190426020109.32319-1-sean.j.christopherson@intel.com> User-Agent: Mutt/1.9.1 (2017-09-22) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9238 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904260022 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9238 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904260022 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Thu, Apr 25, 2019 at 07:01:09PM -0700, Sean Christopherson wrote: > ...to avoid dereferencing a null pointer when querying the per-vCPU > timer advance. > > Fixes: 39497d7660d98 ("KVM: lapic: Track lapic timer advance per vCPU") > Reported-by: syzbot+f7e65445a40d3e0e4ebf@syzkaller.appspotmail.com Reviewed-by: Konrad Rzeszutek Wilk > Signed-off-by: Sean Christopherson > --- > arch/x86/kvm/lapic.c | 3 --- > arch/x86/kvm/x86.c | 3 ++- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c > index 7decd58c9cea..35b8ac8f04fe 100644 > --- a/arch/x86/kvm/lapic.c > +++ b/arch/x86/kvm/lapic.c > @@ -1487,9 +1487,6 @@ void wait_lapic_expire(struct kvm_vcpu *vcpu) > u32 timer_advance_ns = apic->lapic_timer.timer_advance_ns; > u64 guest_tsc, tsc_deadline, ns; > > - if (!lapic_in_kernel(vcpu)) > - return; > - > if (apic->lapic_timer.expired_tscdeadline == 0) > return; > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index aa26a3cfc765..21cb34d8ae01 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -7872,7 +7872,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) > } > > trace_kvm_entry(vcpu->vcpu_id); > - if (vcpu->arch.apic->lapic_timer.timer_advance_ns) > + if (lapic_in_kernel(vcpu) && > + vcpu->arch.apic->lapic_timer.timer_advance_ns) > wait_lapic_expire(vcpu); > guest_enter_irqoff(); > > -- > 2.21.0 >