From: "Leizhen (ThunderTown)" <thunder.leizhen@huawei.com>
To: Oliver O'Halloran <oohall@gmail.com>,
Dan Williams <dan.j.williams@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>,
"Dave Jiang" <dave.jiang@intel.com>,
Ira Weiny <ira.weiny@intel.com>,
Markus Elfring <Markus.Elfring@web.de>,
linux-nvdimm <linux-nvdimm@lists.01.org>,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v4 1/1] libnvdimm: fix memory leaks in of_pmem.c
Date: Sat, 19 Sep 2020 19:38:32 +0800 [thread overview]
Message-ID: <6bba2182-5229-627e-11e4-347e12c21bd1@huawei.com> (raw)
In-Reply-To: <20200901081450.1969-2-thunder.leizhen@huawei.com>
Hi, all:
Is this patch acceptable?
On 2020/9/1 16:14, Zhen Lei wrote:
> Currently, in the last error path of of_pmem_region_probe() and in
> of_pmem_region_remove(), free the memory allocated by kstrdup() is
> missing. Add kfree(priv->bus_desc.provider_name) to fix it.
>
> In addition, add a sanity check to kstrdup() to prevent a
> NULL-pointer dereference.
>
> Fixes: 49bddc73d15c ("libnvdimm/of_pmem: Provide a unique name for bus provider")
> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
> Reviewed-by: Oliver O'Halloran <oohall@gmail.com>
> ---
> drivers/nvdimm/of_pmem.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c
> index 10dbdcdfb9ce913..13c4c274ca6ea88 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);
> + 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);
> kfree(priv);
> return -ENODEV;
> }
> @@ -83,6 +89,7 @@ static int of_pmem_region_remove(struct platform_device *pdev)
> struct of_pmem_private *priv = platform_get_drvdata(pdev);
>
> nvdimm_bus_unregister(priv->bus);
> + kfree(priv->bus_desc.provider_name);
> kfree(priv);
>
> return 0;
>
next prev parent reply other threads:[~2020-09-19 11:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-01 8:14 [PATCH v4 0/1] libnvdimm: fix memory leaks in of_pmem.c Zhen Lei
2020-09-01 8:14 ` [PATCH v4 1/1] " Zhen Lei
2020-09-19 11:38 ` Leizhen (ThunderTown) [this message]
[not found] ` <9d82bd85-5d6c-b8fe-15c7-c87348aa7a3a@web.de>
2020-09-01 11:11 ` [PATCH v4 0/1] " Leizhen (ThunderTown)
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=6bba2182-5229-627e-11e4-347e12c21bd1@huawei.com \
--to=thunder.leizhen@huawei.com \
--cc=Markus.Elfring@web.de \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=ira.weiny@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--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 NNTP newsgroup(s).