* [PATCH v2] nvdimm: of_pmem: Check return value and add kfree for kstrdup
@ 2023-08-29 3:16 Chen Ni
2023-08-29 22:45 ` Ira Weiny
0 siblings, 1 reply; 2+ messages in thread
From: Chen Ni @ 2023-08-29 3:16 UTC (permalink / raw)
To: dan.j.williams, vishal.l.verma, dave.jiang, ira.weiny, oohall
Cc: aneesh.kumar, nvdimm, linux-kernel, Chen Ni
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);
+ 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;
}
--
2.25.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v2] nvdimm: of_pmem: Check return value and add kfree for kstrdup
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
0 siblings, 0 replies; 2+ messages in thread
From: Ira Weiny @ 2023-08-29 22:45 UTC (permalink / raw)
To: Chen Ni, dan.j.williams, vishal.l.verma, dave.jiang, ira.weiny, oohall
Cc: aneesh.kumar, nvdimm, linux-kernel, Chen Ni
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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-08-29 22:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®