[PATCH 2/4] drivers/macintosh/smu.c: add missing of_node_put
From: Julia Lawall [EMAIL PROTECTED]
of_node_put is needed before discarding a value received from
of_find_node_by_type, eg in error handling code.
The semantic patch that makes the change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// smpl
@@
struct device_node *n;
struct device_node *n1;
struct device_node *n2;
statement S;
identifier f1,f2;
expression E1,E2;
constant C;
@@
n = of_find_node_by_type(...)
...
if (!n) S
... when != of_node_put(n)
when != n1 = f1(n,...)
when != E1 = n
when any
when strict
(
+ of_node_put(n);
return -C;
|
of_node_put(n);
|
n2 = f2(n,...)
|
E2 = n
|
return ...;
)
// /smpl
Signed-off-by: Julia Lawall [EMAIL PROTECTED]
---
diff -u -p a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -483,12 +483,15 @@ int __init smu_init (void)
if (smu_cmdbuf_abs == 0) {
printk(KERN_ERR SMU: Command buffer not allocated !\n);
+ of_node_put(np);
return -EINVAL;
}
smu = alloc_bootmem(sizeof(struct smu_device));
- if (smu == NULL)
+ if (smu == NULL) {
+ of_node_put(np);
return -ENOMEM;
+ }
memset(smu, 0, sizeof(*smu));
spin_lock_init(smu-lock);
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [PATCH 2/4] drivers/macintosh/smu.c: add missing of_node_put
On Mon, 9 Jun 2008 14:20:42 +0200 (CEST) Julia Lawall [EMAIL PROTECTED] wrote: From: Julia Lawall [EMAIL PROTECTED] of_node_put is needed before discarding a value received from of_find_node_by_type, eg in error handling code. The semantic patch that makes the change is as follows: (http://www.emn.fr/x-info/coccinelle/) // smpl @@ struct device_node *n; struct device_node *n1; struct device_node *n2; statement S; identifier f1,f2; expression E1,E2; constant C; @@ n = of_find_node_by_type(...) ... if (!n) S ... when != of_node_put(n) when != n1 = f1(n,...) when != E1 = n when any when strict ( + of_node_put(n); return -C; | of_node_put(n); | n2 = f2(n,...) | E2 = n | return ...; ) // /smpl Signed-off-by: Julia Lawall [EMAIL PROTECTED] Acked-by: Stephen Rothwell [EMAIL PROTECTED] However, the error handling in that routine (smu_init) needs much more work. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgp0wnP6Fbm2h.pgp Description: PGP signature ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [PATCH 2/4] drivers/macintosh/smu.c: add missing of_node_put
However, the error handling in that routine (smu_init) needs much more work. Indeed, the smu = NULL at the end of the function seems a bit brutal - a lot of allocated data ends up not getting freed. I can try to do something about it. Did you see something else? julia ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [PATCH 2/4] drivers/macintosh/smu.c: add missing of_node_put
Hi Julia, On Mon, 9 Jun 2008 15:22:53 +0200 (CEST) Julia Lawall [EMAIL PROTECTED] wrote: However, the error handling in that routine (smu_init) needs much more work. Indeed, the smu = NULL at the end of the function seems a bit brutal - a lot of allocated data ends up not getting freed. I can try to do something about it. Did you see something else? There are paths to fail: where you would need to of_node_put smu-db_node or smu-msg_node (or both) and undo the smu-db_buf ioremap. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpGXFgUzRbpi.pgp Description: PGP signature ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
