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

Commit c2e27c35 authored by Nicolas Palix's avatar Nicolas Palix Committed by David S. Miller
Browse files

sparc: Add missing of_node_put 

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;
struct device_node *n1;
statement S;
identifier f;
expression E;
expression *ptr != NULL;
@@

n@p1 = of_find_node_by_name(...)
...
if (!n) S
... when != of_node_put(n)
    when != n1 = f(n,...)
    when != E = n
    when any
    when strict
(
  return \(0\|<+...n...+>\|ptr\);
|
return@p2 ...;
|
  of_node_put(n);
|
  n1 = f(n,...)
|
  E = 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>

Signed-off-by: default avatarNicolas Palix <npalix@diku.dk>
Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a8c601ca

arch/sparc/kernel/sun4c_irq.c

+2 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ static void __init sun4c_init_timers(irq_handler_t counter_fn) 
	sun4c_timers = (void __iomem *) (unsigned long) addr[0];



	irq = of_get_property(dp, "intr", NULL);

	of_node_put(dp);

	if (!irq) {

		prom_printf("sun4c_init_timers: No intr property\n");

		prom_halt();
@@ -200,6 +201,7 @@ void __init sun4c_init_IRQ(void) 
	}



	addr = of_get_property(dp, "address", NULL);

	of_node_put(dp);

	if (!addr) {

		prom_printf("sun4c_init_IRQ: No address property\n");

		prom_halt();

arch/sparc/kernel/sun4d_irq.c

+1 −0
Original line number Diff line number Diff line
@@ -508,6 +508,7 @@ static void __init sun4d_init_timers(irq_handler_t counter_fn) 
	 * bootbus.

	 */

	reg = of_get_property(dp, "reg", NULL);

	of_node_put(dp);

	if (!reg) {

		prom_printf("sun4d_init_timers: No reg property\n");

		prom_halt();

arch/sparc/kernel/sun4m_irq.c

+2 −0
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ static void __init sun4m_init_timers(irq_handler_t counter_fn) 
	}



	addr = of_get_property(dp, "address", &len);

	of_node_put(dp);

	if (!addr) {

		printk(KERN_ERR "sun4m_init_timers: No 'address' prop.\n");

		return;
@@ -437,6 +438,7 @@ void __init sun4m_init_IRQ(void) 
	}



	addr = of_get_property(dp, "address", &len);

	of_node_put(dp);

	if (!addr) {

		printk(KERN_ERR "sun4m_init_IRQ: No 'address' prop.\n");

		return;