2021-05-08 06:19:42

by Christophe JAILLET

Subject: [PATCH V2] 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: e888d445ac33 ("nvmem: resolve cells from DT at registration time")
Signed-off-by: Christophe JAILLET <[email protected]>
---
v2: Reorder code to delay the 'cell->np = of_node_get(child);'
Without this change, we needed a double 'of_node_put' in the last
hunk which could be confusing to the reader
---
drivers/nvmem/core.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index bca671ff4e54..f9c9c9859919 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -686,15 +686,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 = kasprintf(GFP_KERNEL, "%pOFn", child);
@@ -715,11 +717,12 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
cell->name, nvmem->stride);
/* Cells already added will be freed later. */
kfree_const(cell->name);
- of_node_put(cell->np);
kfree(cell);
+ of_node_put(child);
return -EINVAL;
}

+ cell->np = of_node_get(child);
nvmem_cell_add(cell);
}

--
2.30.2

2021-05-17 13:56:05

by Srinivas Kandagatla

Subject: Re: [PATCH V2] nvmem: core: add a missing of_node_put

On 08/05/2021 07:16, Christophe JAILLET wrote:
> '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: e888d445ac33 ("nvmem: resolve cells from DT at registration time")
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---


Applied thanks,

--srini

> v2: Reorder code to delay the 'cell->np = of_node_get(child);'
> Without this change, we needed a double 'of_node_put' in the last
> hunk which could be confusing to the reader
> ---
> drivers/nvmem/core.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
> index bca671ff4e54..f9c9c9859919 100644
> --- a/drivers/nvmem/core.c
> +++ b/drivers/nvmem/core.c
> @@ -686,15 +686,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 = kasprintf(GFP_KERNEL, "%pOFn", child);
> @@ -715,11 +717,12 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
> cell->name, nvmem->stride);
> /* Cells already added will be freed later. */
> kfree_const(cell->name);
> - of_node_put(cell->np);
> kfree(cell);
> + of_node_put(child);
> return -EINVAL;
> }
>
> + cell->np = of_node_get(child);
> nvmem_cell_add(cell);
> }
>
>