Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d14a373f authored by Chen Ni's avatar Chen Ni Committed by Greg Kroah-Hartman
Browse files

libnvdimm/of_pmem: Use devm_kstrdup instead of kstrdup and check its return value 



[ Upstream commit 6fd4ebfc4d61e3097b595ab2725d513e3bbd6739 ]

Use devm_kstrdup() instead of kstrdup() and check its return value to
avoid memory leak.

Fixes: 49bddc73 ("libnvdimm/of_pmem: Provide a unique name for bus provider")
Signed-off-by: default avatarChen Ni <nichen@iscas.ac.cn>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f5d95a39

drivers/nvdimm/of_pmem.c

+7 −1
Original line number Diff line number Diff line
@@ -42,7 +42,13 @@ static int of_pmem_region_probe(struct platform_device *pdev) 
		return -ENOMEM;



	priv->bus_desc.attr_groups = bus_attr_groups;

	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;