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

Commit d8d1049e authored by Dan Carpenter's avatar Dan Carpenter Committed by Lee Jones
Browse files

BACKPORT: nvmem: core: Fix a resource leak on error in nvmem_add_cells_from_of() 



This doesn't call of_node_put() on the error path so it leads to a
memory leak.

Bug: 254441685
Fixes: 0749aa25af82 ("nvmem: core: fix regression in of_nvmem_cell_get()")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20210129171430.11328-2-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 72e008ce307fa2f35f6783997378b32e83122839)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: I1a34db56d82297e28bcb1baee37a78f9126063e4
parent 9e3bee8a

drivers/nvmem/core.c

+1 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem) 
			dev_err(dev, "cell %s unaligned to nvmem stride %d\n",

				cell->name, nvmem->stride);

			/* Cells already added will be freed later. */

			of_node_put(cell->np);

			kfree(cell);

			return -EINVAL;

		}