| From 670493fb15f5801a83417532950da42488b8e19a Mon Sep 17 00:00:00 2001 |
| From: Vaibhav Jain <vaibhav@linux.ibm.com> |
| Date: Wed, 22 Jan 2020 21:21:40 +0530 |
| Subject: [PATCH] powerpc/papr_scm: Fix leaking 'bus_desc.provider_name' in |
| some paths |
| |
| commit 5649607a8d0b0e019a4db14aab3de1e16c3a2b4f upstream. |
| |
| 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: b5beae5e224f ("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 |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c |
| index 3c17fc7c2b93..8debe017c0d6 100644 |
| --- a/arch/powerpc/platforms/pseries/papr_scm.c |
| +++ b/arch/powerpc/platforms/pseries/papr_scm.c |
| @@ -238,6 +238,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; |
| } |
| |
| @@ -382,6 +383,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; |
| -- |
| 2.7.4 |
| |
