patch "nvmem: core: fix leaks on registration errors" added to char-misc-testing
Subsystems (2)
This is a note to let you know that I've just added the patch titled
nvmem: core: fix leaks on registration errors
to my char-misc git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
in the char-misc-testing branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will be merged to the char-misc-next branch sometime soon, after it passes testing, and the merge window is open.
If you have any questions about this process, please let me know.
Quoted 1 line
From
3360acdf839170b612f5b212539694c20e3f16d0Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Fri, 9 Jun 2017 10:59:07 +0100
Subject: 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.
--- drivers/nvmem/core.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/nvmem/core.c +8 -5
@@ -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; -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);
Signature · 1 line
2.13.1