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 A776EC48BC4 for ; Fri, 16 Feb 2024 16:12:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2C1DE8D0003; Fri, 16 Feb 2024 11:12:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 272148D0002; Fri, 16 Feb 2024 11:12:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 13A4A8D0003; Fri, 16 Feb 2024 11:12:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 039E48D0002 for ; Fri, 16 Feb 2024 11:12:16 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9B0F5C0299 for ; Fri, 16 Feb 2024 16:12:15 +0000 (UTC) X-FDA: 81798159030.28.8B48398 Received: from smtpout.efficios.com (smtpout.efficios.com [167.114.26.122]) by imf04.hostedemail.com (Postfix) with ESMTP id C3D0F4000F for ; Fri, 16 Feb 2024 16:12:13 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=efficios.com header.s=smtpout1 header.b=J33MIMhw; spf=pass (imf04.hostedemail.com: domain of mathieu.desnoyers@efficios.com designates 167.114.26.122 as permitted sender) smtp.mailfrom=mathieu.desnoyers@efficios.com; dmarc=pass (policy=none) header.from=efficios.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708099934; a=rsa-sha256; cv=none; b=BuUP5C3x1zwKReVoXei3jzf8yh6SdDSoMOnpsGNSkW+4y9KJeDbO4e0XXObJkuU0bBE7ZS Ig9H/zddBZh1UE+6rprLVjg9Bwkl50Alvp2LpMy1ZV/iZ5lsiDFSoRZRrbEvH61KdC/eMy f4BWcCDcFe/kGr5MbFFvDD5o5bVJ6sw= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=efficios.com header.s=smtpout1 header.b=J33MIMhw; spf=pass (imf04.hostedemail.com: domain of mathieu.desnoyers@efficios.com designates 167.114.26.122 as permitted sender) smtp.mailfrom=mathieu.desnoyers@efficios.com; dmarc=pass (policy=none) header.from=efficios.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708099934; 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=0XE01omQmXhi634jVT6MSb7ct6/uYPeh/zGkoeZJ+SY=; b=Mw8WQ0GSxtwI0wGYWsP8pFyr7ayFx0mkdqwTsld54jYxIic+uq0XVG6khmfhYPboSUZAgx M2wHtI2QQzO2IW880x5CakvD+yTU6BC46+ZrC7VZ0DoMEj1EbLIMyChdw5deXR18rjDrYC 1AdMYDUEFFv0Wi0QCd4aR1akalJdGGc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1708099932; bh=j5ltBz0S3ICkzCrc/XcApSY34K9YqHdS5mIysJ7Jd74=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=J33MIMhwZk5o7KEheMPmr1d83pdskjJ17R8laWareJbgXesmkpn6RDFWFkNHcr5Wp mVpzGv2eFlPhGyKG76pJU7J4ctLWrAqNaDaCe9dnQm572yvxl2Tgf31z1dmiapsKhu 37bHMZ6hPN6Sffp+H0HvNh8icfMjLkUhwv38wV2Uqs1YIfPLJZo9S/D4NnPVUOoduG H2Y1cTYPGukbVxjb7OuZSzVb9AOhBDLrPLkaxMyaOE7vrsEDvJWZYI8mTfQ+0PD1Pv WRvy5/PoG7SI9yl9QyYpSAJfFX+l4RQRSyzi8rXEYkPpnZxN5l+D6O4UAG6DmQi48R 56MVY5X4U/yEg== Received: from [172.16.0.134] (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4Tbxlc1zQxzZmV; Fri, 16 Feb 2024 11:12:12 -0500 (EST) Message-ID: <8a5ca852-1c83-4479-8e4d-5a274482df25@efficios.com> Date: Fri, 16 Feb 2024 11:12:11 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] nvdimm/pmem: Fix leak on dax_add_host() failure Content-Language: en-US To: Andrew Morton Cc: Dave Jiang , Fan Ni , Alasdair Kergon , Mike Snitzer , Mikulas Patocka , Linus Torvalds , Vishal Verma , Matthew Wilcox , 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, Dan Williams , Dave Chinner , Arnd Bergmann References: <20240215144324.95436-1-mathieu.desnoyers@efficios.com> From: Mathieu Desnoyers In-Reply-To: <20240215144324.95436-1-mathieu.desnoyers@efficios.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: C3D0F4000F X-Stat-Signature: ch1e8cq3yj3q7p7bhj67mwhxdgukfkg5 X-Rspam-User: X-HE-Tag: 1708099933-747860 X-HE-Meta: U2FsdGVkX18rCvOdT4RoZBHXBz7Cc0NpiDmZLNqluGNajedbRjbcViW5uvIfLN9c6wdvkFyzhOCnCcApwLzMonzmpTzLa9Un3Y82ZyKhZXH7R5N+GK9QMVnSgiEEVvxbWQABK5aOYNkk9uWdh6SYHkXvnFG2TxYFfcQqMwbOpNT51XTmKQ6uDNT61yV3+rFsKRrb0PYHx/OAMqMxEryErBMi+3Ovq8A9apax3is+sKNs08fhj/Bc9EiNoKV0XZzttWMIiG0wDPBxBZOX4/IvAZVZseIdx1XeHt5cRrXq07nqsvnxMzyDyQFeniCqYtMMFYTgpCRi6h/Gmcknb1DYNccqoOUYiiRgpYHJsrTOFI2/OztiV1DS67vBBzRzQCk090MbpXSdOcCpdN/1zAFiNBZzjIPO/uC4NBIJvmcmI6chObqj70u6s2PP3U7rfj8kmkTdHFdopsWSJAaKm1poRgekJZBfeanY3yG2KYTJ6uab0cO8GsxUKXvXbX+rlWF6RCoyEmoDdkzO3JdBTak6JJWV5RBAysUho1TiCGl1BpsaS4Z179hym3g7dOukNP03wXl+LKFKTVtxP/0g3RDwGvLm4C11XwEVpz/wlH4ELu9p/ZauFX/JFc3O9SMXI9xU/SEPXjA1LsdYETQMqI+pWQeZXvi30Sdx5fQVgl2qDNez3rrRgdPNoMkvZDrOHp/IWx2z3wQxoLUn3a/qsRKWIJY8EzUrsdU2vOmbheHmIE47tcDVJi5GoEdCHx4Eo6DufPp1c1jQMEokc48YGy1nGfb1VQhltjC6qr1Wm3s9G2ZPy5mExTiG0uK5Kx9PubVxuqOAjU1qFMxIgPVdksKKlQs6sfaTYDps4pkSOkAbog61NjHffz4Pux5eppWw5pI015GhWXEInvtLx+ddzp2Wfj2cQAQgHYLje+FBMPR3FYedvJ2oZ28JNUUbS8FN50BSly4Pcd3fPkifWlUeGMB +u6lQfy0 avP8mkdzwfaGcoXM= 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 2024-02-15 09:43, 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: Hi Andrew, I notice that you should update the patch you have in your tree (https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/nvdimm-pmem-fix-leak-on-dax_add_host-failure.patch) with this updated version which includes additional Reviewed-by tags and removes unneeded context that appears to be taken from the previous cover letter. Following your request, I have extracted this patch from the series. Thanks, Mathieu > > out_cleanup_dax: > kill_dax(pmem->dax_dev); > put_dax(pmem->dax_dev); > > Signed-off-by: Mathieu Desnoyers > Reviewed-by: Dan Williams > Reviewed-by: Dave Jiang > Reviewed-by: Fan Ni > 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 > --- > Changes since v1: > - Add Reviewed-by tags. > --- > 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; -- Mathieu Desnoyers EfficiOS Inc. https://www.efficios.com