| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152 |
- From bd1244561fa2a4531ded40dbf09c9599084f8b29 Mon Sep 17 00:00:00 2001
- From: Gaosheng Cui <[email protected]>
- Date: Fri, 16 Sep 2022 13:04:02 +0100
- Subject: [PATCH] nvmem: core: Fix memleak in nvmem_register()
- dev_set_name will alloc memory for nvmem->dev.kobj.name in
- nvmem_register, when nvmem_validate_keepouts failed, nvmem's
- memory will be freed and return, but nobody will free memory
- for nvmem->dev.kobj.name, there will be memleak, so moving
- nvmem_validate_keepouts() after device_register() and let
- the device core deal with cleaning name in error cases.
- Fixes: de0534df9347 ("nvmem: core: fix error handling while validating keepout regions")
- Cc: [email protected]
- Signed-off-by: Gaosheng Cui <[email protected]>
- Signed-off-by: Srinivas Kandagatla <[email protected]>
- Link: https://lore.kernel.org/r/[email protected]
- Signed-off-by: Greg Kroah-Hartman <[email protected]>
- ---
- drivers/nvmem/core.c | 15 ++++++---------
- 1 file changed, 6 insertions(+), 9 deletions(-)
- --- a/drivers/nvmem/core.c
- +++ b/drivers/nvmem/core.c
- @@ -830,21 +830,18 @@ struct nvmem_device *nvmem_register(cons
- nvmem->dev.groups = nvmem_dev_groups;
- #endif
-
- - if (nvmem->nkeepout) {
- - rval = nvmem_validate_keepouts(nvmem);
- - if (rval) {
- - ida_free(&nvmem_ida, nvmem->id);
- - kfree(nvmem);
- - return ERR_PTR(rval);
- - }
- - }
- -
- dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name);
-
- rval = device_register(&nvmem->dev);
- if (rval)
- goto err_put_device;
-
- + if (nvmem->nkeepout) {
- + rval = nvmem_validate_keepouts(nvmem);
- + if (rval)
- + goto err_device_del;
- + }
- +
- if (config->compat) {
- rval = nvmem_sysfs_setup_compat(nvmem, config);
- if (rval)
|
