lkml.org 
[lkml]   [2020]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 29/64] of/address: Fix of_node memory leak in of_dma_is_coherent
    Date
    From: Evan Nimmo <evan.nimmo@alliedtelesis.co.nz>

    [ Upstream commit a5bea04fcc0b3c0aec71ee1fd58fd4ff7ee36177 ]

    Commit dabf6b36b83a ("of: Add OF_DMA_DEFAULT_COHERENT & select it on
    powerpc") added a check to of_dma_is_coherent which returns early
    if OF_DMA_DEFAULT_COHERENT is enabled. This results in the of_node_put()
    being skipped causing a memory leak. Moved the of_node_get() below this
    check so we now we only get the node if OF_DMA_DEFAULT_COHERENT is not
    enabled.

    Fixes: dabf6b36b83a ("of: Add OF_DMA_DEFAULT_COHERENT & select it on powerpc")
    Signed-off-by: Evan Nimmo <evan.nimmo@alliedtelesis.co.nz>
    Link: https://lore.kernel.org/r/20201110022825.30895-1-evan.nimmo@alliedtelesis.co.nz
    Signed-off-by: Rob Herring <robh@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/of/address.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/of/address.c b/drivers/of/address.c
    index b3bf8762f4e8c..77881432dd404 100644
    --- a/drivers/of/address.c
    +++ b/drivers/of/address.c
    @@ -1014,11 +1014,13 @@ EXPORT_SYMBOL_GPL(of_dma_get_range);
    */
    bool of_dma_is_coherent(struct device_node *np)
    {
    - struct device_node *node = of_node_get(np);
    + struct device_node *node;

    if (IS_ENABLED(CONFIG_OF_DMA_DEFAULT_COHERENT))
    return true;

    + node = of_node_get(np);
    +
    while (node) {
    if (of_property_read_bool(node, "dma-coherent")) {
    of_node_put(node);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-11-17 14:10    [W:4.043 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site