From: Julia Lawall <julia@diku.dk>
To: Benjamin Herrenschmidt
<benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
Subject: [PATCH 6/7] arch/powerpc/platforms/maple/setup.c: Add of_node_put to avoid memory leak
Date: Sun, 29 Aug 2010 09:52:45 +0000 [thread overview]
Message-ID: <1283075566-27441-7-git-send-email-julia@diku.dk> (raw)
In-Reply-To: <1283075566-27441-1-git-send-email-julia-dAYI7NvHqcQ@public.gmane.org>
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>
---
arch/powerpc/platforms/maple/setup.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index 3fff8d9..fe34c3d 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -358,6 +358,7 @@ static int __init maple_cpc925_edac_setup(void)
model = (const unsigned char *)of_get_property(np, "model", NULL);
if (!model) {
printk(KERN_ERR "%s: Unabel to get model info\n", __func__);
+ of_node_put(np);
return -ENODEV;
}
next prev parent reply other threads:[~2010-08-29 9:52 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-29 9:52 [PATCH 0/7] Add of_node_put to avoid memory leak Julia Lawall
2010-08-29 9:52 ` [PATCH 2/7] drivers/serial/mpc52xx_uart.c: " Julia Lawall
2010-08-29 15:42 ` [PATCH 2/7] drivers/serial/mpc52xx_uart.c: Add of_node_put to Wolfram Sang
[not found] ` <1283075566-27441-1-git-send-email-julia-dAYI7NvHqcQ@public.gmane.org>
2010-08-29 9:52 ` [PATCH 1/7] drivers/macintosh/via-pmu-led.c: Add of_node_put to avoid memory leak Julia Lawall
2010-08-31 15:49 ` [PATCH 1/7] drivers/macintosh/via-pmu-led.c: Add of_node_put walter harms
[not found] ` <4C7D247F.4060500-fPG8STNUNVg@public.gmane.org>
2010-08-31 16:08 ` [PATCH 1/7] drivers/macintosh/via-pmu-led.c: Add of_node_put to Julia Lawall
[not found] ` <Pine.LNX.4.64.1008311807470.2668-QfmoRoYWmW9knbxzx/v8hQ@public.gmane.org>
2010-08-31 16:13 ` [PATCH 1/7] drivers/macintosh/via-pmu-led.c: Add of_node_put Grant Likely
2010-08-31 16:16 ` Vasiliy Kulikov
2010-08-31 16:33 ` [PATCH 1/7] drivers/macintosh/via-pmu-led.c: Add of_node_put to Grant Likely
2010-09-01 15:03 ` [PATCH 1/7] drivers/macintosh/via-pmu-led.c: Add of_node_put walter harms
2010-08-29 9:52 ` [PATCH 3/7] drivers/mtd/nand/mpc5121_nfc.c: Add of_node_put to avoid memory leak Julia Lawall
[not found] ` <1283075566-27441-4-git-send-email-julia-dAYI7NvHqcQ@public.gmane.org>
2010-08-29 15:47 ` [PATCH 3/7] drivers/mtd/nand/mpc5121_nfc.c: Add of_node_put to Wolfram Sang
2010-08-30 13:13 ` Artem Bityutskiy
2010-08-29 9:52 ` [PATCH 4/7] arch/powerpc/platforms/powermac/pfunc_core.c: Add of_node_put to avoid memory leak Julia Lawall
2010-09-08 19:54 ` [PATCH 4/7] arch/powerpc/platforms/powermac/pfunc_core.c: Add Grant Likely
2010-08-29 9:52 ` [PATCH 5/7] arch/powerpc/sysdev/qe_lib/qe.c: Add of_node_put to avoid memory leak Julia Lawall
2010-08-30 20:39 ` [PATCH 5/7] arch/powerpc/sysdev/qe_lib/qe.c: Add of_node_put Timur Tabi
[not found] ` <1283075566-27441-6-git-send-email-julia-dAYI7NvHqcQ@public.gmane.org>
2010-08-31 21:41 ` [PATCH 5/7] arch/powerpc/sysdev/qe_lib/qe.c: Add of_node_put to avoid memory leak Kumar Gala
2010-08-29 9:52 ` Julia Lawall [this message]
[not found] ` <1283075566-27441-7-git-send-email-julia-dAYI7NvHqcQ@public.gmane.org>
2010-09-08 19:51 ` [PATCH 6/7] arch/powerpc/platforms/maple/setup.c: Add Grant Likely
2010-08-29 9:52 ` [PATCH 7/7] arch/powerpc/platforms/cell: Add of_node_put to avoid memory leak Julia Lawall
2010-09-08 19:46 ` [PATCH 7/7] arch/powerpc/platforms/cell: Add of_node_put to Grant Likely
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-7-git-send-email-julia@diku.dk \
--to=julia@diku.dk \
--cc=benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org \
--cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
--cc=kernel-janitors-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.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