From: Ira Weiny <ira.weiny@intel.com>
To: Chen Ni <nichen@iscas.ac.cn>, <dan.j.williams@intel.com>,
<vishal.l.verma@intel.com>, <dave.jiang@intel.com>,
<ira.weiny@intel.com>, <oohall@gmail.com>
Cc: <aneesh.kumar@linux.ibm.com>, <nvdimm@lists.linux.dev>,
<linux-kernel@vger.kernel.org>, Chen Ni <nichen@iscas.ac.cn>
Subject: Re: [PATCH v2] nvdimm: of_pmem: Check return value and add kfree for kstrdup
Date: Tue, 29 Aug 2023 15:45:52 -0700 [thread overview]
Message-ID: <64ee75208876f_18d28a2942d@iweiny-mobl.notmuch> (raw)
In-Reply-To: <20230829031637.8103-1-nichen@iscas.ac.cn>
Chen Ni wrote:
> Check the return value of kstrdup() and add kfree() for kstrdup() to
> avoid memory leak.
>
> Fixes: 49bddc73d15c ("libnvdimm/of_pmem: Provide a unique name for bus provider")
> Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
> ---
> Changelog:
>
> v1 -> v2:
>
> 1.Add a fixes tag.
> 2.Update commit message.
> ---
> drivers/nvdimm/of_pmem.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c
> index 10dbdcdfb9ce..fe6edb7e6631 100644
> --- a/drivers/nvdimm/of_pmem.c
> +++ b/drivers/nvdimm/of_pmem.c
> @@ -31,11 +31,17 @@ static int of_pmem_region_probe(struct platform_device *pdev)
> return -ENOMEM;
>
> priv->bus_desc.provider_name = kstrdup(pdev->name, GFP_KERNEL);
Could this be done with a devm_kstrdup()?
> + if (!priv->bus_desc.provider_name) {
> + kfree(priv);
> + return -ENOMEM;
> + }
> +
> priv->bus_desc.module = THIS_MODULE;
> priv->bus_desc.of_node = np;
>
> priv->bus = bus = nvdimm_bus_register(&pdev->dev, &priv->bus_desc);
> if (!bus) {
> + kfree(priv->bus_desc.provider_name);
If not using devm_kstrdup() don't you need a kfree in
of_pmem_region_remove?
Ira
> kfree(priv);
> return -ENODEV;
> }
> --
> 2.25.1
>
prev parent reply other threads:[~2023-08-29 22:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-29 3:16 [PATCH v2] nvdimm: of_pmem: Check return value and add kfree for kstrdup Chen Ni
2023-08-29 22:45 ` Ira Weiny [this message]
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=64ee75208876f_18d28a2942d@iweiny-mobl.notmuch \
--to=ira.weiny@intel.com \
--cc=aneesh.kumar@linux.ibm.com \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nichen@iscas.ac.cn \
--cc=nvdimm@lists.linux.dev \
--cc=oohall@gmail.com \
--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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).