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

Commit 47198550 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Lee Jones
Browse files

BACKPORT: nvmem: core: add a missing of_node_put 



'for_each_child_of_node' performs an of_node_get on each iteration, so a
return from the middle of the loop requires an of_node_put.

Bug: 254441685
Fixes: e888d445ac33 ("nvmem: resolve cells from DT at registration time")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20210611102321.11509-1-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 63879e2964bceee2aa5bbe8b99ea58bba28bb64f)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: I30942d12d2d803ddb066a84b6401dcc7180954be
parent f47c1c07

drivers/nvmem/core.c

+6 −3
Original line number Diff line number Diff line
@@ -252,15 +252,17 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem) 
			continue;

		if (len < 2 * sizeof(u32)) {

			dev_err(dev, "nvmem: invalid reg on %pOF\n", child);

			of_node_put(child);

			return -EINVAL;

		}



		cell = kzalloc(sizeof(*cell), GFP_KERNEL);

		if (!cell)

		if (!cell) {

			of_node_put(child);

			return -ENOMEM;

		}



		cell->nvmem = nvmem;

		cell->np = of_node_get(child);

		cell->offset = be32_to_cpup(addr++);

		cell->bytes = be32_to_cpup(addr);

		cell->name = child->name;
@@ -280,11 +282,12 @@ 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);

			of_node_put(child);

			return -EINVAL;

		}



		cell->np = of_node_get(child);

		nvmem_cell_add(cell);

	}