lkml.org 
[lkml]   [2017]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 50/72] nvmem: core: fix leaks on registration errors
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johan Hovold <johan@kernel.org>

    commit 3360acdf839170b612f5b212539694c20e3f16d0 upstream.

    Make sure to deregister and release the nvmem device and underlying
    memory on registration errors.

    Note that the private data must be freed using put_device() once the
    struct device has been initialised.

    Also note that there's a related reference leak in the deregistration
    function as reported by Mika Westerberg which is being fixed separately.

    Fixes: b6c217ab9be6 ("nvmem: Add backwards compatibility support for older EEPROM drivers.")
    Fixes: eace75cfdcf7 ("nvmem: Add a simple NVMEM framework for nvmem providers")
    Cc: Andrew Lunn <andrew@lunn.ch>
    Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Acked-by: Andrey Smirnov <andrew.smirnov@gmail.com>
    Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/nvmem/core.c | 13 ++++++++-----
    1 file changed, 8 insertions(+), 5 deletions(-)

    --- a/drivers/nvmem/core.c
    +++ b/drivers/nvmem/core.c
    @@ -488,21 +488,24 @@ struct nvmem_device *nvmem_register(cons

    rval = device_add(&nvmem->dev);
    if (rval)
    - goto out;
    + goto err_put_device;

    if (config->compat) {
    rval = nvmem_setup_compat(nvmem, config);
    if (rval)
    - goto out;
    + goto err_device_del;
    }

    if (config->cells)
    nvmem_add_cells(nvmem, config);

    return nvmem;
    -out:
    - ida_simple_remove(&nvmem_ida, nvmem->id);
    - kfree(nvmem);
    +
    +err_device_del:
    + device_del(&nvmem->dev);
    +err_put_device:
    + put_device(&nvmem->dev);
    +
    return ERR_PTR(rval);
    }
    EXPORT_SYMBOL_GPL(nvmem_register);

    \
     
     \ /
      Last update: 2017-07-19 12:33    [W:2.431 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site