Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce62df33 authored by Michael Walle's avatar Michael Walle Committed by Greg Kroah-Hartman
Browse files

nvmem: core: fix cell removal on error 



commit db3546d58b5a0fa581d9c9f2bdc2856fa6c5e43e upstream.

nvmem_add_cells() could return an error after some cells are already
added to the provider. In this case, the added cells are not removed.
Remove any registered cells if nvmem_add_cells() fails.

Fixes: fa72d847 ("nvmem: check the return value of nvmem_add_cells()")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230127104015.23839-9-srinivas.kandagatla@linaro.org


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

drivers/nvmem/core.c

+1 −2
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) 
	if (config->cells) {

		rval = nvmem_add_cells(nvmem, config->cells, config->ncells);

		if (rval)

			goto err_teardown_compat;

			goto err_remove_cells;

	}



	rval = nvmem_add_cells_from_table(nvmem);
@@ -456,7 +456,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) 


err_remove_cells:

	nvmem_device_remove_all_cells(nvmem);

err_teardown_compat:

	if (config->compat)

		nvmem_sysfs_remove_compat(nvmem, config);

err_device_del: