From mboxrd@z Thu Jan 1 00:00:00 1970 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=-7.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 3ACD3C433E1 for ; Wed, 26 Aug 2020 16:13:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CEA392075E for ; Wed, 26 Aug 2020 16:13:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="weIFlYPO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CEA392075E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 40A706B0026; Wed, 26 Aug 2020 12:13:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3BAB78D0001; Wed, 26 Aug 2020 12:13:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 25B596B0028; Wed, 26 Aug 2020 12:13:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0209.hostedemail.com [216.40.44.209]) by kanga.kvack.org (Postfix) with ESMTP id 0AB516B0026 for ; Wed, 26 Aug 2020 12:13:21 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id A1FFA1E00 for ; Wed, 26 Aug 2020 16:13:20 +0000 (UTC) X-FDA: 77193214560.25.noise76_5e1488b27065 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id 48B2F1804E3A1 for ; Wed, 26 Aug 2020 16:13:20 +0000 (UTC) X-HE-Tag: noise76_5e1488b27065 X-Filterd-Recvd-Size: 7540 Received: from aserp2120.oracle.com (aserp2120.oracle.com [141.146.126.78]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Wed, 26 Aug 2020 16:13:19 +0000 (UTC) Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 07QG9nD4183771; Wed, 26 Aug 2020 16:13:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : subject : to : cc : references : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=corp-2020-01-29; bh=fFrZ5t4iEv9eEUgGRr/WcyRPsnQi9KFqRoaZkPW8z10=; b=weIFlYPOpMTxP+cTF+3DDEqObcHB0XjC33MnVsmP3aHAaprzLmCG3zN3b0EvLgFz+jT3 VHCJcjz9XMcEDOuNT4+RmdiuOgO0//dvFnCJUwYrJh7j/SEBSm9mp6IqnFo6vDqu0aPO D/QLmwgMwWYf1x8r14cYEQdu5LYg2VWdanPHglBWyrdL4uW+JlpKDk7to08b3NOW3xWO HAqc7kOZ6f+nKMQgMj8ASj5xWl0Ep1h7nmajfTQBmJViejG9IWg70Px8b3lIcEWayFB5 EFnHb4b37ocmErdB7hI3jmdGxtoqVNAqbiISh5WWnX7Rn+GQAIVBuJDBFeYXszkmD1S8 eQ== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2120.oracle.com with ESMTP id 333dbs1eph-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 26 Aug 2020 16:13:17 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 07QGAebG075947; Wed, 26 Aug 2020 16:13:16 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userp3020.oracle.com with ESMTP id 333ru0axw8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 26 Aug 2020 16:13:16 +0000 Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 07QGDFDR010116; Wed, 26 Aug 2020 16:13:15 GMT Received: from [10.175.216.96] (/10.175.216.96) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 26 Aug 2020 09:13:15 -0700 From: Joao Martins Subject: Re: [linux-next:master] BUILD REGRESSION 3a00d3dfd4b68b208ecd5405e676d06c8ad6bb63 To: Andrew Morton Cc: kernel test robot , Linux Memory Management List , Vishal L Verma , Dan Williams References: <5f457d73.gsRq3vmXOfOBWd0d%lkp@intel.com> <20200825143218.7fc406bf642ad7f0cc9cfb26@linux-foundation.org> Message-ID: <6d57acf7-63cf-168d-f68e-67d88832f10f@oracle.com> Date: Wed, 26 Aug 2020 17:13:12 +0100 MIME-Version: 1.0 In-Reply-To: <20200825143218.7fc406bf642ad7f0cc9cfb26@linux-foundation.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9725 signatures=668679 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 phishscore=0 spamscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2008260119 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9725 signatures=668679 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 phishscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 mlxscore=0 lowpriorityscore=0 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2008260119 X-Rspamd-Queue-Id: 48B2F1804E3A1 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 8/25/20 10:32 PM, Andrew Morton wrote: > On Wed, 26 Aug 2020 05:06:59 +0800 kernel test robot wrote: > >> drivers/dax/bus.c:626 alloc_dev_dax_range() error: potential null dereference 'alloc'. (__request_region returns null) >> drivers/dax/bus.c:626 alloc_dev_dax_range() error: we previously assumed 'alloc' could be null (see line 610) > > yes, looks fishy: > > alloc = __request_region(res, start, size, dev_name(dev), 0); > if (!alloc && !dev_dax->nr_range) { > /* > * If we adjusted an existing @ranges leave it alone, > * but if this was an empty set of ranges nothing else > * will release @ranges, so do it now. > */ > kfree(ranges); > return -ENOMEM; > } > > ... > > .start = alloc->start, > > Added by "[PATCH v4 18/23] device-dax: Add dis-contiguous resource > support", > https://lkml.kernel.org/r/159643104304.4062302.16561669534797528660.stgit@dwillia2-desk3.amr.corp.intel.com > This should have been: diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c index 8dd82ea9d53d..06a789aba58a 100644 --- a/drivers/dax/bus.c +++ b/drivers/dax/bus.c @@ -607,13 +607,16 @@ static int alloc_dev_dax_range(struct dev_dax *dev_dax, u64 start, return -ENOMEM; alloc = __request_region(res, start, size, dev_name(dev), 0); - if (!alloc && !dev_dax->nr_range) { + if (!alloc) { /* - * If we adjusted an existing @ranges leave it alone, - * but if this was an empty set of ranges nothing else + * If this was an empty set of ranges nothing else * will release @ranges, so do it now. */ - kfree(ranges); + if (!dev_dax->nr_range) { + kfree(ranges); + ranges = NULL; + } + dev_dax->ranges = ranges; return -ENOMEM; } To kfree only with nr_range == 0, while also avoiding the leakage of @ranges (from krealloc success case with nr_ranges > 0) without the null deref that this introduces. > >> drivers/dax/device.c:111:21: warning: variable 'dax_region' set but not used [-Wunused-but-set-variable] > > yup, "device-dax: make align a per-device property" needs > > --- a/drivers/dax/device.c~device-dax-make-align-a-per-device-property-fix > +++ a/drivers/dax/device.c > @@ -108,7 +108,6 @@ static vm_fault_t __dev_dax_pmd_fault(st > { > unsigned long pmd_addr = vmf->address & PMD_MASK; > struct device *dev = &dev_dax->dev; > - struct dax_region *dax_region; > phys_addr_t phys; > pgoff_t pgoff; > unsigned int fault_size = PMD_SIZE; > @@ -116,7 +115,6 @@ static vm_fault_t __dev_dax_pmd_fault(st > if (check_vma(dev_dax, vmf->vma, __func__)) > return VM_FAULT_SIGBUS; > > - dax_region = dev_dax->region; > if (dev_dax->align > PMD_SIZE) { > dev_dbg(dev, "alignment (%#x) > fault size (%#x)\n", > dev_dax->align, fault_size); > @@ -151,7 +149,6 @@ static vm_fault_t __dev_dax_pud_fault(st > { > unsigned long pud_addr = vmf->address & PUD_MASK; > struct device *dev = &dev_dax->dev; > - struct dax_region *dax_region; > phys_addr_t phys; > pgoff_t pgoff; > unsigned int fault_size = PUD_SIZE; > @@ -160,7 +157,6 @@ static vm_fault_t __dev_dax_pud_fault(st > if (check_vma(dev_dax, vmf->vma, __func__)) > return VM_FAULT_SIGBUS; > > - dax_region = dev_dax->region; > if (dev_dax->align > PUD_SIZE) { > dev_dbg(dev, "alignment (%#x) > fault size (%#x)\n", > dev_dax->align, fault_size); > _ > Yes. And also the MEMORY_HOTPLUG=n and ACPI=n build issues that Randy/you fixed which are introduced by this series too. Just to confirm: I should add up all these fixes and respin the series right? Or should I follow-up the first one on top of what you've already staged in -mm tree? Joao