Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: stable@vger.kernel.org
Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220916120402.38753-1-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Gaosheng Cui and committed by
Greg Kroah-Hartman
bd124456 e291691c

+6 -9
+6 -9
drivers/nvmem/core.c
··· 829 829 nvmem->dev.groups = nvmem_dev_groups; 830 830 #endif 831 831 832 - if (nvmem->nkeepout) { 833 - rval = nvmem_validate_keepouts(nvmem); 834 - if (rval) { 835 - ida_free(&nvmem_ida, nvmem->id); 836 - kfree(nvmem); 837 - return ERR_PTR(rval); 838 - } 839 - } 840 - 841 832 dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); 842 833 843 834 rval = device_register(&nvmem->dev); 844 835 if (rval) 845 836 goto err_put_device; 837 + 838 + if (nvmem->nkeepout) { 839 + rval = nvmem_validate_keepouts(nvmem); 840 + if (rval) 841 + goto err_device_del; 842 + } 846 843 847 844 if (config->compat) { 848 845 rval = nvmem_sysfs_setup_compat(nvmem, config);