From: Dave Jiang <dave.jiang@intel.com>
To: Guangshuo Li <lgs201920130244@gmail.com>,
Dan Williams <dan.j.williams@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>,
Ira Weiny <ira.weiny@intel.com>,
Santosh Sivaraj <santosh@fossix.org>,
nvdimm@lists.linux.dev, linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org
Subject: Re: [PATCH v2] nvdimm: ndtest: Return -ENOMEM if devm_kcalloc() fails in ndtest_probe()
Date: Tue, 23 Sep 2025 09:38:33 -0700 [thread overview]
Message-ID: <767ef629-519c-431d-9a89-224ceabf22be@intel.com> (raw)
In-Reply-To: <20250923125953.1859373-1-lgs201920130244@gmail.com>
On 9/23/25 5:59 AM, Guangshuo Li wrote:
> 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 under low-memory conditions.
>
> Check all three allocations and return -ENOMEM if any allocation fails.
> Do not emit an extra error message since the allocator already warns on
> allocation failure.
>
> Fixes: 9399ab61ad82 ("ndtest: Add dimms to the two buses")
> Cc: stable@vger.kernel.org
> Signed-off-by: Guangshuo Li <lgs201920130244@gmail.com>
> ---
> Changes in v2:
> - Drop pr_err() on allocation failure; only NULL-check and return -ENOMEM.
> - No other changes.
> ---
> tools/testing/nvdimm/test/ndtest.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/tools/testing/nvdimm/test/ndtest.c b/tools/testing/nvdimm/test/ndtest.c
> index 68a064ce598c..abdbe0c1cb63 100644
> --- a/tools/testing/nvdimm/test/ndtest.c
> +++ b/tools/testing/nvdimm/test/ndtest.c
> @@ -855,6 +855,9 @@ 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)
> + return -ENOMEM;
Why not just check as it allocates instead of doing it all at the end? If an allocation failed, no need to attempt to allocate more (which probably leads to more failures).
DJ
> +
> rc = ndtest_nvdimm_init(p);
> if (rc)
> goto err;
next prev parent reply other threads:[~2025-09-23 16:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-23 12:59 [PATCH v2] nvdimm: ndtest: Return -ENOMEM if devm_kcalloc() fails in ndtest_probe() Guangshuo Li
2025-09-23 16:38 ` Dave Jiang [this message]
2025-09-23 18:52 ` Alison Schofield
[not found] ` <CANUHTR9X2=VPHPY8r++SqHZu-+i7GGP7sqbGUnAx+M89iiYS4A@mail.gmail.com>
2025-09-24 15:34 ` Dave Jiang
2025-09-24 15:45 ` Ira Weiny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=767ef629-519c-431d-9a89-224ceabf22be@intel.com \
--to=dave.jiang@intel.com \
--cc=dan.j.williams@intel.com \
--cc=ira.weiny@intel.com \
--cc=lgs201920130244@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nvdimm@lists.linux.dev \
--cc=santosh@fossix.org \
--cc=stable@vger.kernel.org \
--cc=vishal.l.verma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox