From: Julia Lawall <julia@diku.dk>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@lists.ozlabs.org,
devicetree-discuss@lists.ozlabs.org,
kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/7] drivers/macintosh/via-pmu-led.c: Add of_node_put to avoid memory leak
Date: Sun, 29 Aug 2010 11:52:40 +0200 [thread overview]
Message-ID: <1283075566-27441-2-git-send-email-julia@diku.dk> (raw)
In-Reply-To: <1283075566-27441-1-git-send-email-julia@diku.dk>
Add a call to of_node_put in the error handling code following a call to
of_find_node_by_path.
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: Julia Lawall <julia@diku.dk>
---
drivers/macintosh/via-pmu-led.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c
index d242976..19c3718 100644
--- a/drivers/macintosh/via-pmu-led.c
+++ b/drivers/macintosh/via-pmu-led.c
@@ -92,8 +92,10 @@ static int __init via_pmu_led_init(void)
if (dt == NULL)
return -ENODEV;
model = of_get_property(dt, "model", NULL);
- if (model == NULL)
+ if (model == NULL) {
+ of_node_put(dt);
return -ENODEV;
+ }
if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 &&
strncmp(model, "iBook", strlen("iBook")) != 0 &&
strcmp(model, "PowerMac7,2") != 0 &&
next parent reply other threads:[~2010-08-29 10:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1283075566-27441-1-git-send-email-julia@diku.dk>
2010-08-29 9:52 ` Julia Lawall [this message]
2010-08-31 15:49 ` [PATCH 1/7] drivers/macintosh/via-pmu-led.c: Add of_node_put to avoid memory leak walter harms
2010-08-31 16:08 ` Julia Lawall
2010-08-31 16:13 ` Grant Likely
2010-08-31 16:16 ` Vasiliy Kulikov
2010-08-31 16:33 ` Grant Likely
2010-09-01 15:03 ` walter harms
2010-08-29 9:52 ` [PATCH 4/7] arch/powerpc/platforms/powermac/pfunc_core.c: " Julia Lawall
2010-09-08 19:54 ` Grant Likely
2010-08-29 9:52 ` [PATCH 5/7] arch/powerpc/sysdev/qe_lib/qe.c: " Julia Lawall
2010-08-30 20:39 ` Timur Tabi
2010-08-31 21:41 ` Kumar Gala
2010-08-29 9:52 ` [PATCH 6/7] arch/powerpc/platforms/maple/setup.c: " Julia Lawall
2010-09-08 19:51 ` Grant Likely
2010-08-29 9:52 ` [PATCH 7/7] arch/powerpc/platforms/cell: " Julia Lawall
2010-09-08 19:46 ` Grant Likely
[not found] ` <1283075566-27441-3-git-send-email-julia@diku.dk>
2010-08-29 15:42 ` [PATCH 2/7] drivers/serial/mpc52xx_uart.c: " Wolfram Sang
[not found] ` <1283075566-27441-4-git-send-email-julia@diku.dk>
2010-08-29 15:47 ` [PATCH 3/7] drivers/mtd/nand/mpc5121_nfc.c: " Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1283075566-27441-2-git-send-email-julia@diku.dk \
--to=julia@diku.dk \
--cc=benh@kernel.crashing.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).