lkml.org 
[lkml]   [2020]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.5 071/120] powerpc/papr_scm: Fix leaking bus_desc.provider_name in some paths
    Date
    From: Vaibhav Jain <vaibhav@linux.ibm.com>

    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/powerpc/platforms/pseries/papr_scm.c | 2 ++
    1 file changed, 2 insertions(+)

    --- 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 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 platfo

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

    return 0;

    \
     
     \ /
      Last update: 2020-02-13 16:41    [W:5.109 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site