[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250918141606.3589435-1-lgs201920130244@gmail.com>
Date: Thu, 18 Sep 2025 22:16:06 +0800
From: Guangshuo Li <lgs201920130244@...il.com>
To: Dan Williams <dan.j.williams@...el.com>,
Vishal Verma <vishal.l.verma@...el.com>,
Dave Jiang <dave.jiang@...el.com>,
Ira Weiny <ira.weiny@...el.com>,
Guangshuo Li <lgs201920130244@...il.com>,
Santosh Sivaraj <santosh@...six.org>,
nvdimm@...ts.linux.dev,
linux-kernel@...r.kernel.org
Cc: stable@...r.kernel.org
Subject: [PATCH] nvdimm: ndtest: Add check for devm_kcalloc() allocations in ndtest_probe()
devm_kcalloc() may fail. ndtest_probe() allocates three DMA address
arrays (dcr_dma, label_dma, dimm_dma) and later unconditionally uses
them in ndtest_nvdimm_init(), which can lead to a NULL pointer
dereference on allocation failure.
Add NULL checks for all three allocations and return -ENOMEM if any
allocation fails.
Fixes: 9399ab61ad82 ("ndtest: Add dimms to the two buses")
Cc: stable@...r.kernel.org
Signed-off-by: Guangshuo Li <lgs201920130244@...il.com>
---
tools/testing/nvdimm/test/ndtest.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/testing/nvdimm/test/ndtest.c b/tools/testing/nvdimm/test/ndtest.c
index 68a064ce598c..516f304bb0b9 100644
--- a/tools/testing/nvdimm/test/ndtest.c
+++ b/tools/testing/nvdimm/test/ndtest.c
@@ -855,6 +855,11 @@ static int ndtest_probe(struct platform_device *pdev)
p->dimm_dma = devm_kcalloc(&p->pdev.dev, NUM_DCR,
sizeof(dma_addr_t), GFP_KERNEL);
+ if (!p->dcr_dma || !p->label_dma || !p->dimm_dma) {
+ pr_err("%s: failed to allocate DMA address arrays\n", __func__);
+ return -ENOMEM;
+ }
+
rc = ndtest_nvdimm_init(p);
if (rc)
goto err;
--
2.43.0
Powered by blists - more mailing lists