| Message ID | 20200122155140.120429-1-vaibhav@linux.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5649607a8d0b0e019a4db14aab3de1e16c3a2b4f |
| Headers | show |
| Series | powerpc/papr_scm: Fix leaking 'bus_desc.provider_name' in some paths | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (20862247a368dbb75d6e97d82345999adaacf3cc) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 14 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
On 1/22/20 9:21 PM, Vaibhav Jain wrote: > 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(). > > Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com> > --- > arch/powerpc/platforms/pseries/papr_scm.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c > index c2ef320ba1bf..eb420655ed0b 100644 > --- a/arch/powerpc/platforms/pseries/papr_scm.c > +++ b/arch/powerpc/platforms/pseries/papr_scm.c > @@ -322,6 +322,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; > Add similar error handling to of-pmem driver too? -aneesh
On Wed, 2020-01-22 at 15:51:40 UTC, Vaibhav Jain wrote: > 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(). > > Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/5649607a8d0b0e019a4db14aab3de1e16c3a2b4f cheers
diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c index c2ef320ba1bf..eb420655ed0b 100644 --- a/arch/powerpc/platforms/pseries/papr_scm.c +++ b/arch/powerpc/platforms/pseries/papr_scm.c @@ -322,6 +322,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;
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(). Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com> --- arch/powerpc/platforms/pseries/papr_scm.c | 2 ++ 1 file changed, 2 insertions(+)