Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/powerpc/platforms/cell/ras.c

+3 −1
Original line number Diff line number Diff line
@@ -173,8 +173,10 @@ static int __init cbe_ptcal_enable(void) 
		return -ENODEV;



	size = of_get_property(np, "ibm,cbe-ptcal-size", NULL);

	if (!size)

	if (!size) {

		of_node_put(np);

		return -ENODEV;

	}



	pr_debug("%s: enabling PTCAL, size = 0x%x\n", __func__, *size);

	order = get_order(*size);

arch/powerpc/platforms/cell/spider-pic.c

+3 −1
Original line number Diff line number Diff line
@@ -258,8 +258,10 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic) 
		return NO_IRQ;

	imap += intsize + 1;

	tmp = of_get_property(iic, "#interrupt-cells", NULL);

	if (tmp == NULL)

	if (tmp == NULL) {

		of_node_put(iic);

		return NO_IRQ;

	}

	intsize = *tmp;

	/* Assume unit is last entry of interrupt specifier */

	unit = imap[intsize - 1];