lkml.org 
[lkml]   [2019]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 003/220] tee: optee: add missing of_node_put after of_device_is_available
    Date
    From: Julia Lawall <Julia.Lawall@lip6.fr>

    commit c7c0d8df0b94a67377555a550b8d66ee2ad2f4ed upstream.

    Add an of_node_put when a tested device node is not available.

    The semantic patch that fixes this problem is as follows
    (http://coccinelle.lip6.fr):

    // <smpl>
    @@
    identifier f;
    local idexpression e;
    expression x;
    @@

    e = f(...);
    ... when != of_node_put(e)
    when != x = e
    when != e = x
    when any
    if (<+...of_device_is_available(e)...+>) {
    ... when != of_node_put(e)
    (
    return e;
    |
    + of_node_put(e);
    return ...;
    )
    }
    // </smpl>

    Fixes: db878f76b9ff ("tee: optee: take DT status property into account")
    Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
    Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
    Cc: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/tee/optee/core.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/tee/optee/core.c
    +++ b/drivers/tee/optee/core.c
    @@ -696,8 +696,10 @@ static int __init optee_driver_init(void
    return -ENODEV;

    np = of_find_matching_node(fw_np, optee_match);
    - if (!np || !of_device_is_available(np))
    + if (!np || !of_device_is_available(np)) {
    + of_node_put(np);
    return -ENODEV;
    + }

    optee = optee_probe(np);
    of_node_put(np);

    \
     
     \ /
      Last update: 2019-11-22 12:13    [W:3.521 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site