Replace kstrdup() with devm_kstrdup() to avoid memory leak and
add check for the return value of the devm_kstrdup() to avoid
NULL pointer dereference

Fixes: 49bddc73d15c ("libnvdimm/of_pmem: Provide a unique name for bus 
provider")
Signed-off-by: Jiasheng Jiang <jiash...@iscas.ac.cn>
---
 drivers/nvdimm/of_pmem.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c
index 10dbdcdfb9ce..5106dfe0147b 100644
--- a/drivers/nvdimm/of_pmem.c
+++ b/drivers/nvdimm/of_pmem.c
@@ -30,7 +30,12 @@ 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->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


Reply via email to