Skip to content

Commit

Permalink
tee: optee: add missing of_node_put after of_device_is_available
Browse files Browse the repository at this point in the history
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: db878f7 ("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>
  • Loading branch information
Julia Lawall authored and Jens Wiklander committed Feb 28, 2019
1 parent 49a5785 commit c7c0d8d
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/tee/optee/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -699,8 +699,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);
Expand Down

0 comments on commit c7c0d8d

Please sign in to comment.