Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <1550928043-14889-1-git-send-email-Julia.Lawall@lip6.fr> <1550928043-14889-6-git-send-email-Julia.Lawall@lip6.fr>
In-Reply-To: <1550928043-14889-6-git-send-email-Julia.Lawall@lip6.fr>
From:   Jens Wiklander <jens.wiklander@linaro.org>
Date:   Thu, 28 Feb 2019 12:17:01 +0100
Message-ID: <CAHUa44HdtbAocBgc3gj5RZZPQs_uf85XnDsgUKfGPuzi+H0Z7w@mail.gmail.com>
Subject: Re: [PATCH 05/12] tee: optee: add missing of_node_put after of_device_is_available
To:     Julia Lawall <Julia.Lawall@lip6.fr>
Cc:     kernel-janitors@vger.kernel.org,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi Julia,
On Sat, Feb 23, 2019 at 2:58 PM Julia Lawall <Julia.Lawall@lip6.fr> wrote:
>
> 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>
>
> ---
>  drivers/tee/optee/core.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff -u -p a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
> --- a/drivers/tee/optee/core.c
> +++ b/drivers/tee/optee/core.c
> @@ -703,8 +703,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);
>

Applied.

Thanks,
Jens