powerpc/pseries: Add missing of_node_put in setup.c
Subsystems (2)
PATCH 1/1 powerpc/pseries: Add missing of_node_put in setup.c
of_node_put is needed before discarding a value received from of_find_node_by_name, eg in error handling code or when the device node is no longer used.
The semantic match that catches the bug is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression struct device_node *n;
position p1, p2;
statement S1,S2;
expression E,E1;
expression *ptr != NULL;
@@
(
if (!(n@p1 = of_find_node_by_name(...))) S1
|
n@p1 = of_find_node_by_name(...)
)
<... when != of_node_put(n)
when != if (...) { <+... of_node_put(n) ...+> }
when != true !n || ...
when != n = E
when != E = nif (!n || ...) S2
...>
(
return \(0\|<+...n...+>\|ptr\);
|
return@p2 ...;
|
n = E1
|
E1 = n
)
@script:python@
p1 << r.p1;
p2 << r.p2;
@@
print "* file: %s of_find_node_by_name %s return %s" % (p1[0].file,p1[0].line,p2[0].line) // </smpl>
--- arch/powerpc/platforms/pseries/setup.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/powerpc/platforms/pseries/setup.c +2 -1
@@ -237,7 +237,7 @@ static void __init pseries_discover_pic(void) "interrupt-controller"));) { typep =of_get_property (np,"compatible" ,NULL );if (strstr (typep,"open-pic" )) { - pSeries_mpic_node =of_node_get (np); + pSeries_mpic_node = np; ppc_md.init_IRQ = pseries_mpic_init_IRQ; ppc_md.get_irq = mpic_get_irq;setup_kexec_cpu_down_mpic ();
@@ -247,6 +247,7 @@ static void __init pseries_discover_pic(void) ppc_md.init_IRQ = pseries_xics_init_IRQ;setup_kexec_cpu_down_xics ();smp_init_pseries_xics (); +of_node_put (np);return ; } }
Signature · 1 line
Nicolas Palix