Commit 63879e29 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman

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.

Fixes: e888d445 ("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.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fd307a4a
...@@ -690,15 +690,17 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem) ...@@ -690,15 +690,17 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
continue; continue;
if (len < 2 * sizeof(u32)) { if (len < 2 * sizeof(u32)) {
dev_err(dev, "nvmem: invalid reg on %pOF\n", child); dev_err(dev, "nvmem: invalid reg on %pOF\n", child);
of_node_put(child);
return -EINVAL; return -EINVAL;
} }
cell = kzalloc(sizeof(*cell), GFP_KERNEL); cell = kzalloc(sizeof(*cell), GFP_KERNEL);
if (!cell) if (!cell) {
of_node_put(child);
return -ENOMEM; return -ENOMEM;
}
cell->nvmem = nvmem; cell->nvmem = nvmem;
cell->np = of_node_get(child);
cell->offset = be32_to_cpup(addr++); cell->offset = be32_to_cpup(addr++);
cell->bytes = be32_to_cpup(addr); cell->bytes = be32_to_cpup(addr);
cell->name = kasprintf(GFP_KERNEL, "%pOFn", child); cell->name = kasprintf(GFP_KERNEL, "%pOFn", child);
...@@ -719,11 +721,12 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem) ...@@ -719,11 +721,12 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
cell->name, nvmem->stride); cell->name, nvmem->stride);
/* Cells already added will be freed later. */ /* Cells already added will be freed later. */
kfree_const(cell->name); kfree_const(cell->name);
of_node_put(cell->np);
kfree(cell); kfree(cell);
of_node_put(child);
return -EINVAL; return -EINVAL;
} }
cell->np = of_node_get(child);
nvmem_cell_add(cell); nvmem_cell_add(cell);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment