Commit 3bd747c7 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Greg Kroah-Hartman
Browse files

nvmem: core: initialise nvmem->id early 



The error path for wp_gpio attempts to free the IDA nvmem->id, but
this has yet to be assigned, so will always be zero - leaking the
ID allocated by ida_alloc(). Fix this by moving the initialisation
of nvmem->id earlier.

Fixes: f7d8d7dc ("nvmem: fix memory leak in error path")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230127104015.23839-4-srinivas.kandagatla@linaro.org


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

drivers/nvmem/core.c

+2 −1
Original line number Diff line number Diff line
@@ -770,6 +770,8 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) 
		return ERR_PTR(rval);

	}



	nvmem->id = rval;



	if (config->wp_gpio)

		nvmem->wp_gpio = config->wp_gpio;

	else if (!config->ignore_wp)
@@ -785,7 +787,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) 
	kref_init(&nvmem->refcnt);

	INIT_LIST_HEAD(&nvmem->cells);



	nvmem->id = rval;

	nvmem->owner = config->owner;

	if (!nvmem->owner && config->dev->driver)

		nvmem->owner = config->dev->driver->owner;