path: root/drivers/nvmem
diff options
authorJohan Hovold <johan@kernel.org>2017-06-09 10:59:07 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-06-09 12:08:27 +0200
commit3360acdf839170b612f5b212539694c20e3f16d0 (patch)
treefc5713663c21c79d9bb2067642055fc071acaa89 /drivers/nvmem
parente827756d64773515fa7de5e7e942a6d1494bf64e (diff)
nvmem: core: fix leaks on registration errors
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: stable <stable@vger.kernel.org> # 4.3 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>
Diffstat (limited to 'drivers/nvmem')
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 8c830a80a648..6cf916d9db6d 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -489,21 +489,24 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
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;
- ida_simple_remove(&nvmem_ida, nvmem->id);
- kfree(nvmem);
+ device_del(&nvmem->dev);
+ put_device(&nvmem->dev);
return ERR_PTR(rval);

Privacy Policy