Commit 182f30e4 authored by Julia Lawall's avatar Julia Lawall Committed by Benjamin Herrenschmidt

powerpc/cell: Add of_node_put to avoid memory leak

Add calls to of_node_put in the error handling code following calls to
of_find_node_by_path and of_find_node_by_phandle.

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: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 0373721b
...@@ -173,8 +173,10 @@ static int __init cbe_ptcal_enable(void) ...@@ -173,8 +173,10 @@ static int __init cbe_ptcal_enable(void)
return -ENODEV; return -ENODEV;
size = of_get_property(np, "ibm,cbe-ptcal-size", NULL); size = of_get_property(np, "ibm,cbe-ptcal-size", NULL);
if (!size) if (!size) {
of_node_put(np);
return -ENODEV; return -ENODEV;
}
pr_debug("%s: enabling PTCAL, size = 0x%x\n", __func__, *size); pr_debug("%s: enabling PTCAL, size = 0x%x\n", __func__, *size);
order = get_order(*size); order = get_order(*size);
......
...@@ -258,8 +258,10 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic) ...@@ -258,8 +258,10 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic)
return NO_IRQ; return NO_IRQ;
imap += intsize + 1; imap += intsize + 1;
tmp = of_get_property(iic, "#interrupt-cells", NULL); tmp = of_get_property(iic, "#interrupt-cells", NULL);
if (tmp == NULL) if (tmp == NULL) {
of_node_put(iic);
return NO_IRQ; return NO_IRQ;
}
intsize = *tmp; intsize = *tmp;
/* Assume unit is last entry of interrupt specifier */ /* Assume unit is last entry of interrupt specifier */
unit = imap[intsize - 1]; unit = imap[intsize - 1];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment