lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 135/186] powerpc/btext: add missing of_node_put
    Date
    From: Julia Lawall <Julia.Lawall@lip6.fr>

    [ Upstream commit a1d2b210ffa52d60acabbf7b6af3ef7e1e69cda0 ]

    for_each_node_by_type performs an of_node_get on each iteration, so
    a break out of the loop requires an of_node_put.

    A simplified version of the semantic patch that fixes this problem is as
    follows (http://coccinelle.lip6.fr):

    // <smpl>
    @@
    local idexpression n;
    expression e;
    @@

    for_each_node_by_type(n,...) {
    ...
    (
    of_node_put(n);
    |
    e = n
    |
    + of_node_put(n);
    ? break;
    )
    ...
    }
    ... when != n
    // </smpl>

    Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/1448051604-25256-6-git-send-email-Julia.Lawall@lip6.fr
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/kernel/btext.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c
    index 6537cba1a7580..d1a2fc7186ce7 100644
    --- a/arch/powerpc/kernel/btext.c
    +++ b/arch/powerpc/kernel/btext.c
    @@ -258,8 +258,10 @@ int __init btext_find_display(int allow_nonstdout)
    rc = btext_initialize(np);
    printk("result: %d\n", rc);
    }
    - if (rc == 0)
    + if (rc == 0) {
    + of_node_put(np);
    break;
    + }
    }
    return rc;
    }
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 04:09    [W:13.846 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site