From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 15FF4229B17; Wed, 4 Dec 2024 17:03:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733331810; cv=none; b=eoGMPMR1JLBnzzExirCta+7FYnkjxKIzqi9pMUa5Q+WgxcX0Fur5T7RmBZUIAmo1d3s3//xYKfFwC1WnXrTijhbODo4+WCatsQB+26Ie2D9AhBlFhxChn5AGnDV7pNFUWeghfXOmKWp/xiRDfOOwjVSzaTboibVs0YsLurAzi5s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733331810; c=relaxed/simple; bh=y0Ta5sY4OqUiVRPPAeY0cY47eLRaG49ak4eVu1CF15Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aG3oKwNqoJXVH6gfEdneQKMZdj4SWF7ZDAlmxCjpy440UjNiaLdHruE6enY3nmGpFbyuY+urg0PGOu0ExK9y+gtkaG1g9Vqelb62qOTr+LvylSSdGpvojYrrONYTi3oNF32o9WPWfd1fMm0FFYjxqf+dXI7bi1OFjxL+uJR5+Qo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SYZDW4Cn; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SYZDW4Cn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81327C4CED1; Wed, 4 Dec 2024 17:03:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733331809; bh=y0Ta5sY4OqUiVRPPAeY0cY47eLRaG49ak4eVu1CF15Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SYZDW4Cneb4/IH86ihYBZ9wvlCuobDTsC/NRntB91r64xRQgzQb0H9o5ylowpF9tZ eLvTR/V4j/PE/MA+2jN8rdwCI4UGEAev3SVviEHykhFacvL2GDoWmjFG5JVmLhL1FF 67BIfqZ6dqP4s5OLSfg3+Ted/77TbTnKiW+ppXxiGWcnadJY6qGxwUuhUN7CKcA8rA 5T1bCyfZu3UtfA+GCaH3M3gEQ3pCXVEiNldg5Ji9Rjw/YKv26uD4RndCPYBDzgD69/ +uoU/tTGMNveZRk8nOkedTL5qtJ71gudY0xlCgB89Q1CzGQuYdC2MeDIku3Un+2TJ8 QHBcG9ZyUmR9Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yi Yang , Dave Jiang , Ira Weiny , Sasha Levin , dan.j.williams@intel.com, vishal.l.verma@intel.com, nvdimm@lists.linux.dev Subject: [PATCH AUTOSEL 5.10 9/9] nvdimm: rectify the illogical code within nd_dax_probe() Date: Wed, 4 Dec 2024 10:51:55 -0500 Message-ID: <20241204155157.2214959-9-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241204155157.2214959-1-sashal@kernel.org> References: <20241204155157.2214959-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.230 Content-Transfer-Encoding: 8bit From: Yi Yang [ Upstream commit b61352101470f8b68c98af674e187cfaa7c43504 ] When nd_dax is NULL, nd_pfn is consequently NULL as well. Nevertheless, it is inadvisable to perform pointer arithmetic or address-taking on a NULL pointer. Introduce the nd_dax_devinit() function to enhance the code's logic and improve its readability. Signed-off-by: Yi Yang Reviewed-by: Dave Jiang Link: https://patch.msgid.link/20241108085526.527957-1-yiyang13@huawei.com Signed-off-by: Ira Weiny Signed-off-by: Sasha Levin --- drivers/nvdimm/dax_devs.c | 4 ++-- drivers/nvdimm/nd.h | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/nvdimm/dax_devs.c b/drivers/nvdimm/dax_devs.c index 99965077bac4f..e7b8211c19cc6 100644 --- a/drivers/nvdimm/dax_devs.c +++ b/drivers/nvdimm/dax_devs.c @@ -106,12 +106,12 @@ int nd_dax_probe(struct device *dev, struct nd_namespace_common *ndns) nvdimm_bus_lock(&ndns->dev); nd_dax = nd_dax_alloc(nd_region); - nd_pfn = &nd_dax->nd_pfn; - dax_dev = nd_pfn_devinit(nd_pfn, ndns); + dax_dev = nd_dax_devinit(nd_dax, ndns); nvdimm_bus_unlock(&ndns->dev); if (!dax_dev) return -ENOMEM; pfn_sb = devm_kmalloc(dev, sizeof(*pfn_sb), GFP_KERNEL); + nd_pfn = &nd_dax->nd_pfn; nd_pfn->pfn_sb = pfn_sb; rc = nd_pfn_validate(nd_pfn, DAX_SIG); dev_dbg(dev, "dax: %s\n", rc == 0 ? dev_name(dax_dev) : ""); diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h index 696b55556d4d2..12c2be3cdf5cc 100644 --- a/drivers/nvdimm/nd.h +++ b/drivers/nvdimm/nd.h @@ -335,6 +335,13 @@ struct nd_dax *to_nd_dax(struct device *dev); int nd_dax_probe(struct device *dev, struct nd_namespace_common *ndns); bool is_nd_dax(struct device *dev); struct device *nd_dax_create(struct nd_region *nd_region); +static inline struct device *nd_dax_devinit(struct nd_dax *nd_dax, + struct nd_namespace_common *ndns) +{ + if (!nd_dax) + return NULL; + return nd_pfn_devinit(&nd_dax->nd_pfn, ndns); +} #else static inline int nd_dax_probe(struct device *dev, struct nd_namespace_common *ndns) -- 2.43.0