nvmem: core: add a missing of_node_put
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Fri, 11 Jun 2021 10:23:21 +0000 (11:23 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 11 Jun 2021 10:34:04 +0000 (12:34 +0200)
'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: <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>
drivers/nvmem/core.c

index 4d1c4f8..20799e6 100644 (file)
@@ -690,15 +690,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);
@@ -719,11 +721,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);
        }