Commit 5649607a authored Jan 22, 2020 by Vaibhav Jain Committed by Michael Ellerman Jan 26, 2020

powerpc/papr_scm: Fix leaking 'bus_desc.provider_name' in some paths



String 'bus_desc.provider_name' allocated inside
papr_scm_nvdimm_init() will leaks in case call to
nvdimm_bus_register() fails or when papr_scm_remove() is called.

This minor patch ensures that 'bus_desc.provider_name' is freed in
error path for nvdimm_bus_register() as well as in papr_scm_remove().

Fixes: b5beae5e ("powerpc/pseries: Add driver for PAPR SCM regions")
Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200122155140.120429-1-vaibhav@linux.ibm.com

parent 493a55f1

arch/powerpc/platforms/pseries/papr_scm.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -323,6 +323,7 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p)
		p->bus = nvdimm_bus_register(NULL, &p->bus_desc);
		if (!p->bus) {
		dev_err(dev, "Error creating nvdimm bus %pOF\n", p->dn);
		kfree(p->bus_desc.provider_name);
		return -ENXIO;
		}

		@@ -477,6 +478,7 @@ static int papr_scm_remove(struct platform_device *pdev)

		nvdimm_bus_unregister(p->bus);
		drc_pmem_unbind(p);
		kfree(p->bus_desc.provider_name);
		kfree(p);

		return 0;

Admin message