lkml.org 
[lkml]   [2021]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 184/215] nvmem: core: add a missing of_node_put
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    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: 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 | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    --- a/drivers/nvmem/core.c
    +++ b/drivers/nvmem/core.c
    @@ -549,15 +549,17 @@ static int nvmem_add_cells_from_of(struc
    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);
    @@ -578,11 +580,12 @@ static int nvmem_add_cells_from_of(struc
    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);
    }


    \
     
     \ /
      Last update: 2021-07-15 21:03    [W:4.115 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site