public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3] libnvdimm/of_pmem: Use devm_kstrdup instead of kstrdup and check its return value
@ 2023-09-14  7:03 Chen Ni
  2023-09-14 15:31 ` Dave Jiang
  2023-09-15 16:44 ` Ira Weiny
  0 siblings, 2 replies; 4+ messages in thread
From: Chen Ni @ 2023-09-14  7:03 UTC (permalink / raw)
  To: oohall, dan.j.williams, vishal.l.verma, dave.jiang, ira.weiny,
	aneesh.kumar
  Cc: nvdimm, linux-kernel, Chen Ni

Use devm_kstrdup() instead of kstrdup() and check its return value 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:

v2 -> v3:

1. Use devm_kstrdup() instead of kstrdup()

v1 -> v2:

1. Add a fixes tag.
2. Update commit message.
---
 drivers/nvdimm/of_pmem.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c
index 1b9f5b8a6167..5765674b36f2 100644
--- a/drivers/nvdimm/of_pmem.c
+++ b/drivers/nvdimm/of_pmem.c
@@ -30,7 +30,13 @@ static int of_pmem_region_probe(struct platform_device *pdev)
 	if (!priv)
 		return -ENOMEM;
 
-	priv->bus_desc.provider_name = kstrdup(pdev->name, GFP_KERNEL);
+	priv->bus_desc.provider_name = devm_kstrdup(&pdev->dev, 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;
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH v3] libnvdimm/of_pmem: Use devm_kstrdup instead of kstrdup and check its return value
  2023-09-14  7:03 [PATCH v3] libnvdimm/of_pmem: Use devm_kstrdup instead of kstrdup and check its return value Chen Ni
@ 2023-09-14 15:31 ` Dave Jiang
  2023-09-14 19:47   ` Ira Weiny
  2023-09-15 16:44 ` Ira Weiny
  1 sibling, 1 reply; 4+ messages in thread
From: Dave Jiang @ 2023-09-14 15:31 UTC (permalink / raw)
  To: Chen Ni, oohall, dan.j.williams, vishal.l.verma, ira.weiny,
	aneesh.kumar
  Cc: nvdimm, linux-kernel



On 9/14/23 00:03, Chen Ni wrote:
> Use devm_kstrdup() instead of kstrdup() and check its return value 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>


Reviewed-by: Dave Jiang <dave.jiang@intel.com>

One unrelated comment below.

> ---
> Changelog:
> 
> v2 -> v3:
> 
> 1. Use devm_kstrdup() instead of kstrdup()
> 
> v1 -> v2:
> 
> 1. Add a fixes tag.
> 2. Update commit message.
> ---
>  drivers/nvdimm/of_pmem.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c
> index 1b9f5b8a6167..5765674b36f2 100644
> --- a/drivers/nvdimm/of_pmem.c
> +++ b/drivers/nvdimm/of_pmem.c
> @@ -30,7 +30,13 @@ static int of_pmem_region_probe(struct platform_device *pdev)
>  	if (!priv)
>  		return -ENOMEM;
>  
> -	priv->bus_desc.provider_name = kstrdup(pdev->name, GFP_KERNEL);
> +	priv->bus_desc.provider_name = devm_kstrdup(&pdev->dev, pdev->name,
> +							GFP_KERNEL);
> +	if (!priv->bus_desc.provider_name) {
> +		kfree(priv);

I wonder if priv should be allocated with devm_kzalloc() instead to reduce the resource management burden. 

> +		return -ENOMEM;
> +	}
> +
>  	priv->bus_desc.module = THIS_MODULE;
>  	priv->bus_desc.of_node = np;
>  

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v3] libnvdimm/of_pmem: Use devm_kstrdup instead of kstrdup and check its return value
  2023-09-14 15:31 ` Dave Jiang
@ 2023-09-14 19:47   ` Ira Weiny
  0 siblings, 0 replies; 4+ messages in thread
From: Ira Weiny @ 2023-09-14 19:47 UTC (permalink / raw)
  To: Dave Jiang, Chen Ni, oohall, dan.j.williams, vishal.l.verma,
	ira.weiny, aneesh.kumar
  Cc: nvdimm, linux-kernel

Dave Jiang wrote:
> 
> 
> On 9/14/23 00:03, Chen Ni wrote:

[snip]

> > diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c
> > index 1b9f5b8a6167..5765674b36f2 100644
> > --- a/drivers/nvdimm/of_pmem.c
> > +++ b/drivers/nvdimm/of_pmem.c
> > @@ -30,7 +30,13 @@ static int of_pmem_region_probe(struct platform_device *pdev)
> >  	if (!priv)
> >  		return -ENOMEM;
> >  
> > -	priv->bus_desc.provider_name = kstrdup(pdev->name, GFP_KERNEL);
> > +	priv->bus_desc.provider_name = devm_kstrdup(&pdev->dev, pdev->name,
> > +							GFP_KERNEL);
> > +	if (!priv->bus_desc.provider_name) {
> > +		kfree(priv);
> 
> I wonder if priv should be allocated with devm_kzalloc() instead to reduce the resource management burden. 

I think it could be but this is the driver and I wonder if leaving the
allocation around until the platform device goes away was undesirable for
some reason?

Ira

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v3] libnvdimm/of_pmem: Use devm_kstrdup instead of kstrdup and check its return value
  2023-09-14  7:03 [PATCH v3] libnvdimm/of_pmem: Use devm_kstrdup instead of kstrdup and check its return value Chen Ni
  2023-09-14 15:31 ` Dave Jiang
@ 2023-09-15 16:44 ` Ira Weiny
  1 sibling, 0 replies; 4+ messages in thread
From: Ira Weiny @ 2023-09-15 16:44 UTC (permalink / raw)
  To: Chen Ni, oohall, dan.j.williams, vishal.l.verma, dave.jiang,
	ira.weiny, aneesh.kumar
  Cc: nvdimm, linux-kernel, Chen Ni

Chen Ni wrote:
> Use devm_kstrdup() instead of kstrdup() and check its return value 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>

Reviewed-by: Ira Weiny <ira.weiny@intel.com>

> ---
> Changelog:
> 
> v2 -> v3:
> 
> 1. Use devm_kstrdup() instead of kstrdup()
> 
> v1 -> v2:
> 
> 1. Add a fixes tag.
> 2. Update commit message.
> ---
>  drivers/nvdimm/of_pmem.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c
> index 1b9f5b8a6167..5765674b36f2 100644
> --- a/drivers/nvdimm/of_pmem.c
> +++ b/drivers/nvdimm/of_pmem.c
> @@ -30,7 +30,13 @@ static int of_pmem_region_probe(struct platform_device *pdev)
>  	if (!priv)
>  		return -ENOMEM;
>  
> -	priv->bus_desc.provider_name = kstrdup(pdev->name, GFP_KERNEL);
> +	priv->bus_desc.provider_name = devm_kstrdup(&pdev->dev, 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;
>  
> -- 
> 2.25.1
> 



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-09-15 16:45 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-14  7:03 [PATCH v3] libnvdimm/of_pmem: Use devm_kstrdup instead of kstrdup and check its return value Chen Ni
2023-09-14 15:31 ` Dave Jiang
2023-09-14 19:47   ` Ira Weiny
2023-09-15 16:44 ` Ira Weiny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox