Skip to content

Commit bd12445

Browse files
gscuigregkh
authored andcommitted
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: de0534d ("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>
1 parent e291691 commit bd12445

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

drivers/nvmem/core.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -829,21 +829,18 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
829829
nvmem->dev.groups = nvmem_dev_groups;
830830
#endif
831831

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-
841832
dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name);
842833

843834
rval = device_register(&nvmem->dev);
844835
if (rval)
845836
goto err_put_device;
846837

838+
if (nvmem->nkeepout) {
839+
rval = nvmem_validate_keepouts(nvmem);
840+
if (rval)
841+
goto err_device_del;
842+
}
843+
847844
if (config->compat) {
848845
rval = nvmem_sysfs_setup_compat(nvmem, config);
849846
if (rval)

0 commit comments

Comments
 (0)