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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F65FC48297 for ; Mon, 12 Feb 2024 16:56:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 14F4D6B00A0; Mon, 12 Feb 2024 11:56:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D6BF6B00A1; Mon, 12 Feb 2024 11:56:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E91DB8D0001; Mon, 12 Feb 2024 11:56:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D2B136B00A0 for ; Mon, 12 Feb 2024 11:56:13 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A47421409E7 for ; Mon, 12 Feb 2024 16:56:13 +0000 (UTC) X-FDA: 81783754626.22.8417ACB Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by imf26.hostedemail.com (Postfix) with ESMTP id 9B5F014000F for ; Mon, 12 Feb 2024 16:56:10 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=OD5OObuJ; spf=pass (imf26.hostedemail.com: domain of dave.jiang@intel.com designates 192.198.163.18 as permitted sender) smtp.mailfrom=dave.jiang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707756971; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=RfdOJbb0RJT10epv942Kol3z9im6m/K2g2S5htwwo34=; b=LVAlZ8oy9QoUBwbUl1x9MEPBrepuIih1JBql9SsbvQVHN/TuUAzpUuA2+hnVSgsiXXhMHi 22kTx/igHxTPuQknmY+SEGgJR59iRdpdFG/5bV0g4D3ii5Pl4M0krqgfRdf0mWNqmW51em JE3QYHfgBlRwRRpiaIjKuYdWoWjl7+I= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707756971; a=rsa-sha256; cv=none; b=5esr2jDezrNNg4O1T7exJ/KRi7Wdtz+RG0WhbUVLzal8BaEieoq2Lt/tsL4mSqx/cm53dQ Wz69xP0lvZSyF3FxWDSBmFCh5Gxmqk2HLhH+vgNIyflaC2APweINnCofGyPno7Mrgh0lM5 pY2IEvI9aTj7BAD0ZtuQsNg+yO5r51M= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=OD5OObuJ; spf=pass (imf26.hostedemail.com: domain of dave.jiang@intel.com designates 192.198.163.18 as permitted sender) smtp.mailfrom=dave.jiang@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707756971; x=1739292971; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=qEHre5KcrGm7NMQ/uG4bn4q+c/50g4eByXrxSboUeBc=; b=OD5OObuJ42IHv4T7nrK8haQKOGyDdwv3yM6epSPtuOKZQBqUpPLI19FS UunGKnU3612VgxNH+JuLBR28RNGpSFH9XgbWwee9ByDB5Y+rz7ry1ymUu Q1OjV9xPxXOJNbPr3peYuSqD4//rX52xKcPAV5gYdCUVyQa2hcheVdFXB F09K216T8i2VioCHxkK3mtZMOlOKqfRdmTilB1Vcp/3hNE0HkUxuJSAWK ePHB4J3rBHHImy4NcifXhrBBqsQB7+smNKWuGJ+Mp/EcavgIpXetQCOlL D1WQkVgrhsIizlipXJ+xGSr5OlMap7aYy+BQzSRG3bGT5u66Vr7Z75a7g g==; X-IronPort-AV: E=McAfee;i="6600,9927,10982"; a="1611222" X-IronPort-AV: E=Sophos;i="6.06,264,1705392000"; d="scan'208";a="1611222" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Feb 2024 08:55:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,264,1705392000"; d="scan'208";a="7264524" Received: from djiang5-mobl3.amr.corp.intel.com (HELO [10.246.113.42]) ([10.246.113.42]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Feb 2024 08:55:48 -0800 Message-ID: Date: Mon, 12 Feb 2024 09:55:47 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] nvdimm/pmem: Fix leak on dax_add_host() failure Content-Language: en-US To: Mathieu Desnoyers Cc: Dan Williams , Alasdair Kergon , Mike Snitzer , Mikulas Patocka , Andrew Morton , Linus Torvalds , Vishal Verma , Matthew Wilcox , Arnd Bergmann , Russell King , linux-arch@vger.kernel.org, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-xfs@vger.kernel.org, dm-devel@lists.linux.dev, nvdimm@lists.linux.dev References: <20240212162722.19080-1-mathieu.desnoyers@efficios.com> From: Dave Jiang In-Reply-To: <20240212162722.19080-1-mathieu.desnoyers@efficios.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 9B5F014000F X-Rspam-User: X-Stat-Signature: fa4oc8witemxddz43ij7sahqcc9s5tsc X-Rspamd-Server: rspam03 X-HE-Tag: 1707756970-160498 X-HE-Meta: U2FsdGVkX1/2Q3u5NHe+oSEXMuXriW/dDCZ9/VnMhFJNFBeFcz0c6aw3EgKyE2DRCu58lsbIS4O+i4KCG6ejlDzecqCEBo3wcJtXwv3DvPGC/+IYHk8Suf75F92vx43EPfzlyGZFkBT8JxnEoyQOdKfINgqR4UXnYeBAIfNjeSogU6SNfZfz2ZEZ99SnT/v2eeom5R4WywdaVPErOIEMpcDHWcI+ETAD9DioHKPTFkdPfo5zsD/3/TpzXI6u3BdWSpT80ussvTDMN9A7ccVafcJ03wP4ja6RU0jJnqztqvkei/paX1h5qKwoXhFb3YRJ9VEjQMbZrI6jV6+mv2m8fTv2Dug+8HphgiJ442uJqDASyz+spDCt75T9UTBr3KR/H6Or4NvazPVyPslIc2A8ZX648I8sfbue9Lew8mYooAVfdc7Rja6S+5pcloh92/574QTaRKdhzQt2GqKAd/FRNV7CbW9eJuv1+M3nHO3gHTUgMQuzCK6PguxnH+gdUJ7fVybWUnRS31Mp56OGhcNC8dQmKYfkHiqsmsCh3aBpw5wYErWS1D2LPhy6Qiptqd1SUeNsD65dn7YtDgifFCzgK/r9IjJZJ3rQWFSon8urra7OAqCk9IqrgdE2xOSNDN1s6Sg7Ipg1BYlgoeoUhEeW2WuthSVhlvUG6kQhXhOWrF3ZtyJc6SH7GzA0RUKgVK/PfP1HWH3gfbM1/pq8bRNlk46KuZbfElkByejjKSMdPWf6FBnOoahPFyNiuxOrLGWsHyQkAp5FJk9f1lLSajZY+aYFMylhSK92wwyg5/c1yW2K3+JNDTAdFQ3gwCnt/fXP4p6uTxKwcZgghLb6JIs+efMzHp4pg+XQ2biC090dBYREnbIjyevfzighM+MRT0ULrtHUb6wunMzLYZwIvE0Oa5AA26nqRQvM3DuN4QVQw5CUx8qJbWKgRA== 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: List-Subscribe: List-Unsubscribe: On 2/12/24 9:27 AM, Mathieu Desnoyers wrote: > Fix a leak on dax_add_host() error, where "goto out_cleanup_dax" is done > before setting pmem->dax_dev, which therefore issues the two following > calls on NULL pointers: > > out_cleanup_dax: > kill_dax(pmem->dax_dev); > put_dax(pmem->dax_dev); > > Signed-off-by: Mathieu Desnoyers > Reviewed-by: Dan Williams > Cc: Alasdair Kergon > Cc: Mike Snitzer > Cc: Mikulas Patocka > Cc: Andrew Morton > Cc: Linus Torvalds > Cc: Dan Williams > Cc: Vishal Verma > Cc: Dave Jiang > Cc: Matthew Wilcox > Cc: Arnd Bergmann > Cc: Russell King > Cc: linux-arch@vger.kernel.org > Cc: linux-cxl@vger.kernel.org > Cc: linux-fsdevel@vger.kernel.org > Cc: linux-mm@kvack.org > Cc: linux-xfs@vger.kernel.org > Cc: dm-devel@lists.linux.dev > Cc: nvdimm@lists.linux.dev Reviewed-by: Dave Jiang > --- > drivers/nvdimm/pmem.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c > index 4e8fdcb3f1c8..9fe358090720 100644 > --- a/drivers/nvdimm/pmem.c > +++ b/drivers/nvdimm/pmem.c > @@ -566,12 +566,11 @@ static int pmem_attach_disk(struct device *dev, > set_dax_nomc(dax_dev); > if (is_nvdimm_sync(nd_region)) > set_dax_synchronous(dax_dev); > + pmem->dax_dev = dax_dev; > rc = dax_add_host(dax_dev, disk); > if (rc) > goto out_cleanup_dax; > dax_write_cache(dax_dev, nvdimm_has_cache(nd_region)); > - pmem->dax_dev = dax_dev; > - > rc = device_add_disk(dev, disk, pmem_attribute_groups); > if (rc) > goto out_remove_host;