diff options
author | Nicolas Palix <npalix@diku.dk> | 2008-12-04 00:10:57 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-04 12:17:22 -0500 |
commit | c2e27c359ab76fecbbd292dbfc0bcfa8399afdd9 (patch) | |
tree | d5edacb837ce1d1bc35aa2827e00b314e679f400 | |
parent | a8c601ca21e790f6a9d996bb0bf31f7496eb9509 (diff) |
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: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/kernel/sun4c_irq.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4d_irq.c | 1 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4m_irq.c | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/sparc/kernel/sun4c_irq.c b/arch/sparc/kernel/sun4c_irq.c index 5dc8a5769489..bc3adbf79c6a 100644 --- a/arch/sparc/kernel/sun4c_irq.c +++ b/arch/sparc/kernel/sun4c_irq.c | |||
@@ -160,6 +160,7 @@ static void __init sun4c_init_timers(irq_handler_t counter_fn) | |||
160 | sun4c_timers = (void __iomem *) (unsigned long) addr[0]; | 160 | sun4c_timers = (void __iomem *) (unsigned long) addr[0]; |
161 | 161 | ||
162 | irq = of_get_property(dp, "intr", NULL); | 162 | irq = of_get_property(dp, "intr", NULL); |
163 | of_node_put(dp); | ||
163 | if (!irq) { | 164 | if (!irq) { |
164 | prom_printf("sun4c_init_timers: No intr property\n"); | 165 | prom_printf("sun4c_init_timers: No intr property\n"); |
165 | prom_halt(); | 166 | prom_halt(); |
@@ -200,6 +201,7 @@ void __init sun4c_init_IRQ(void) | |||
200 | } | 201 | } |
201 | 202 | ||
202 | addr = of_get_property(dp, "address", NULL); | 203 | addr = of_get_property(dp, "address", NULL); |
204 | of_node_put(dp); | ||
203 | if (!addr) { | 205 | if (!addr) { |
204 | prom_printf("sun4c_init_IRQ: No address property\n"); | 206 | prom_printf("sun4c_init_IRQ: No address property\n"); |
205 | prom_halt(); | 207 | prom_halt(); |
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c index d3cb76ce418b..1c98821e1a64 100644 --- a/arch/sparc/kernel/sun4d_irq.c +++ b/arch/sparc/kernel/sun4d_irq.c | |||
@@ -508,6 +508,7 @@ static void __init sun4d_init_timers(irq_handler_t counter_fn) | |||
508 | * bootbus. | 508 | * bootbus. |
509 | */ | 509 | */ |
510 | reg = of_get_property(dp, "reg", NULL); | 510 | reg = of_get_property(dp, "reg", NULL); |
511 | of_node_put(dp); | ||
511 | if (!reg) { | 512 | if (!reg) { |
512 | prom_printf("sun4d_init_timers: No reg property\n"); | 513 | prom_printf("sun4d_init_timers: No reg property\n"); |
513 | prom_halt(); | 514 | prom_halt(); |
diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c index f10317179ee6..301892e2d718 100644 --- a/arch/sparc/kernel/sun4m_irq.c +++ b/arch/sparc/kernel/sun4m_irq.c | |||
@@ -374,6 +374,7 @@ static void __init sun4m_init_timers(irq_handler_t counter_fn) | |||
374 | } | 374 | } |
375 | 375 | ||
376 | addr = of_get_property(dp, "address", &len); | 376 | addr = of_get_property(dp, "address", &len); |
377 | of_node_put(dp); | ||
377 | if (!addr) { | 378 | if (!addr) { |
378 | printk(KERN_ERR "sun4m_init_timers: No 'address' prop.\n"); | 379 | printk(KERN_ERR "sun4m_init_timers: No 'address' prop.\n"); |
379 | return; | 380 | return; |
@@ -437,6 +438,7 @@ void __init sun4m_init_IRQ(void) | |||
437 | } | 438 | } |
438 | 439 | ||
439 | addr = of_get_property(dp, "address", &len); | 440 | addr = of_get_property(dp, "address", &len); |
441 | of_node_put(dp); | ||
440 | if (!addr) { | 442 | if (!addr) { |
441 | printk(KERN_ERR "sun4m_init_IRQ: No 'address' prop.\n"); | 443 | printk(KERN_ERR "sun4m_init_IRQ: No 'address' prop.\n"); |
442 | return; | 444 | return; |