2021-06-11 10:27:15

by Srinivas Kandagatla

Subject: [RESEND PATCH] nvmem: core: add a missing of_node_put

From: Christophe JAILLET <[email protected]>

'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")
Cc: <[email protected]>
Signed-off-by: Christophe JAILLET <[email protected]>
Signed-off-by: Srinivas Kandagatla <[email protected]>
---
Hi Greg,

Resending just this one with cc stable as rest of nvmem series are already applied.

thanks,
srini

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 b3c28a2d4c10..4868aa876e1b 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.21.0

2021-06-11 10:38:15

by Greg Kroah-Hartman

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

On Fri, Jun 11, 2021 at 11:23:21AM +0100, Srinivas Kandagatla wrote:
> From: Christophe JAILLET <[email protected]>
>
> '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")
> Cc: <[email protected]>
> Signed-off-by: Christophe JAILLET <[email protected]>
> Signed-off-by: Srinivas Kandagatla <[email protected]>
> ---
> Hi Greg,
>
> Resending just this one with cc stable as rest of nvmem series are already applied.

Thanks, now applied.

greg k-h