]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
powerpc/via-pmu-led.c: Add of_node_put to avoid memory leak
authorJulia Lawall <julia@diku.dk>
Sat, 28 Aug 2010 23:52:40 +0000 (23:52 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 2 Sep 2010 04:07:33 +0000 (14:07 +1000)
Add a call to of_node_put in the error handling code following a call to
of_find_node_by_path.

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

// <smpl>
@r exists@
local idexpression x;
expression E,E1;
statement S;
@@

*x =
(of_find_node_by_path
|of_find_node_by_name
|of_find_node_by_phandle
|of_get_parent
|of_get_next_parent
|of_get_next_child
|of_find_compatible_node
|of_match_node
)(...);
...
if (x == NULL) S
<... when != x = E
*if (...) {
  ... when != of_node_put(x)
      when != if (...) { ... of_node_put(x); ... }
(
  return <+...x...+>;
|
*  return ...;
)
}
...>
of_node_put(x);
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
drivers/macintosh/via-pmu-led.c

index d242976bcfe71455b966d3a8cdfa69a7f40dbdbc..19c371809d7776f19aa2adaff75fae9b3bd7904c 100644 (file)
@@ -92,8 +92,10 @@ static int __init via_pmu_led_init(void)
        if (dt == NULL)
                return -ENODEV;
        model = of_get_property(dt, "model", NULL);
-       if (model == NULL)
+       if (model == NULL) {
+               of_node_put(dt);
                return -ENODEV;
+       }
        if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 &&
            strncmp(model, "iBook", strlen("iBook")) != 0 &&
            strcmp(model, "PowerMac7,2") != 0 &&