xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmem: core: add a missing of_node_put

Browse Source 
commit 63879e2964bceee2aa5bbe8b99ea58bba28bb64f upstream.

'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: e888d445ac ("nvmem: resolve cells from DT at registration time")
Cc: <stable@vger.kernel.org>
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20210611102321.11509-1-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christophe JAILLET
2021-06-11 11:23:21 +01:00
committed by Greg Kroah-Hartman
parent f0a079c0ba
commit baedb1f5a0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/nvmem/core.c
View File

@@ -549,15 +549,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);
@@ -578,11 +580,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);
} }