Commit bd124456 authored by Gaosheng Cui's avatar Gaosheng Cui Committed by Greg Kroah-Hartman
Browse files

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: de0534df ("nvmem: core: fix error handling while validating keepout regions")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGaosheng Cui <cuigaosheng1@huawei.com>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220916120402.38753-1-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e291691c

drivers/nvmem/core.c

+6 −9
Original line number Diff line number Diff line
@@ -829,21 +829,18 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) 
	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)