All of lore.kernel.org
 help / color / mirror / Atom feed
From: Julia Lawall <julia@diku.dk>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: kernel-janitors@vger.kernel.org,
	Paul Mackerras <paulus@samba.org>,
	Grant Likely <grant.likely@secretlab.ca>,
	linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
	devicetree-discuss@lists.ozlabs.org
Subject: [PATCH 4/4] arch/powerpc/platforms/chrp/nvram.c: Add of_node_put to avoid memory leak
Date: Tue, 31 Aug 2010 17:48:58 +0200	[thread overview]
Message-ID: <1283269738-14612-5-git-send-email-julia@diku.dk> (raw)
In-Reply-To: <1283269738-14612-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_type.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r exists@
local idexpression x;
expression E,E1,E2;
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
|of_find_node_by_type
|of_find_node_with_property
|of_find_matching_node
|of_parse_phandle
)(...);
...
if (x == NULL) S
<... when != x = E
*if (...) {
  ... when != of_node_put(x)
      when != if (...) { ... of_node_put(x); ... }
(
  return <+...x...+>;
|
*  return ...;
)
}
...>
(
E2 = x;
|
of_node_put(x);
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
 arch/powerpc/platforms/chrp/nvram.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/platforms/chrp/nvram.c b/arch/powerpc/platforms/chrp/nvram.c
index ba3588f..d3ceff0 100644
--- a/arch/powerpc/platforms/chrp/nvram.c
+++ b/arch/powerpc/platforms/chrp/nvram.c
@@ -74,8 +74,10 @@ void __init chrp_nvram_init(void)
 		return;
 
 	nbytes_p = of_get_property(nvram, "#bytes", &proplen);
-	if (nbytes_p == NULL || proplen != sizeof(unsigned int))
+	if (nbytes_p == NULL || proplen != sizeof(unsigned int)) {
+		of_node_put(nvram);
 		return;
+	}
 
 	nvram_size = *nbytes_p;
 


WARNING: multiple messages have this Message-ID (diff)
From: Julia Lawall <julia@diku.dk>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: kernel-janitors@vger.kernel.org,
	Paul Mackerras <paulus@samba.org>,
	Grant Likely <grant.likely@secretlab.ca>,
	linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
	devicetree-discuss@lists.ozlabs.org
Subject: [PATCH 4/4] arch/powerpc/platforms/chrp/nvram.c: Add of_node_put to avoid memory leak
Date: Tue, 31 Aug 2010 15:48:58 +0000	[thread overview]
Message-ID: <1283269738-14612-5-git-send-email-julia@diku.dk> (raw)
In-Reply-To: <1283269738-14612-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_type.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r exists@
local idexpression x;
expression E,E1,E2;
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
|of_find_node_by_type
|of_find_node_with_property
|of_find_matching_node
|of_parse_phandle
)(...);
...
if (x = NULL) S
<... when != x = E
*if (...) {
  ... when != of_node_put(x)
      when != if (...) { ... of_node_put(x); ... }
(
  return <+...x...+>;
|
*  return ...;
)
}
...>
(
E2 = x;
|
of_node_put(x);
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
 arch/powerpc/platforms/chrp/nvram.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/platforms/chrp/nvram.c b/arch/powerpc/platforms/chrp/nvram.c
index ba3588f..d3ceff0 100644
--- a/arch/powerpc/platforms/chrp/nvram.c
+++ b/arch/powerpc/platforms/chrp/nvram.c
@@ -74,8 +74,10 @@ void __init chrp_nvram_init(void)
 		return;
 
 	nbytes_p = of_get_property(nvram, "#bytes", &proplen);
-	if (nbytes_p = NULL || proplen != sizeof(unsigned int))
+	if (nbytes_p = NULL || proplen != sizeof(unsigned int)) {
+		of_node_put(nvram);
 		return;
+	}
 
 	nvram_size = *nbytes_p;
 


WARNING: multiple messages have this Message-ID (diff)
From: Julia Lawall <julia@diku.dk>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: devicetree-discuss@lists.ozlabs.org,
	kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org,
	Paul Mackerras <paulus@samba.org>,
	linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 4/4] arch/powerpc/platforms/chrp/nvram.c: Add of_node_put to avoid memory leak
Date: Tue, 31 Aug 2010 17:48:58 +0200	[thread overview]
Message-ID: <1283269738-14612-5-git-send-email-julia@diku.dk> (raw)
In-Reply-To: <1283269738-14612-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_type.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r exists@
local idexpression x;
expression E,E1,E2;
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
|of_find_node_by_type
|of_find_node_with_property
|of_find_matching_node
|of_parse_phandle
)(...);
...
if (x == NULL) S
<... when != x = E
*if (...) {
  ... when != of_node_put(x)
      when != if (...) { ... of_node_put(x); ... }
(
  return <+...x...+>;
|
*  return ...;
)
}
...>
(
E2 = x;
|
of_node_put(x);
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
 arch/powerpc/platforms/chrp/nvram.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/platforms/chrp/nvram.c b/arch/powerpc/platforms/chrp/nvram.c
index ba3588f..d3ceff0 100644
--- a/arch/powerpc/platforms/chrp/nvram.c
+++ b/arch/powerpc/platforms/chrp/nvram.c
@@ -74,8 +74,10 @@ void __init chrp_nvram_init(void)
 		return;
 
 	nbytes_p = of_get_property(nvram, "#bytes", &proplen);
-	if (nbytes_p == NULL || proplen != sizeof(unsigned int))
+	if (nbytes_p == NULL || proplen != sizeof(unsigned int)) {
+		of_node_put(nvram);
 		return;
+	}
 
 	nvram_size = *nbytes_p;
 

  parent reply	other threads:[~2010-08-31 15:48 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-31 15:48 [PATCH 0/4] Add of_node_put to avoid memory leak Julia Lawall
2010-08-31 15:48 ` Julia Lawall
2010-08-31 15:48 ` Julia Lawall
2010-08-31 15:48 ` [PATCH 1/4] drivers/serial/ucc_uart.c: " Julia Lawall
2010-08-31 15:48   ` Julia Lawall
2010-08-31 15:48   ` Julia Lawall
2010-08-31 15:48   ` Julia Lawall
2010-09-01 18:40   ` Timur Tabi
2010-09-01 18:40     ` Timur Tabi
2010-09-01 18:40     ` [PATCH 1/4] drivers/serial/ucc_uart.c: Add of_node_put to avoid Timur Tabi
2010-09-01 18:40     ` [PATCH 1/4] drivers/serial/ucc_uart.c: Add of_node_put to avoid memory leak Timur Tabi
2010-09-08 19:59   ` Grant Likely
2010-09-08 19:59     ` Grant Likely
2010-09-08 19:59     ` [PATCH 1/4] drivers/serial/ucc_uart.c: Add of_node_put to Grant Likely
2011-03-15 15:51   ` [PATCH 1/4] drivers/serial/ucc_uart.c: Add of_node_put to avoid memory leak Kumar Gala
2011-03-15 15:51     ` Kumar Gala
2011-03-15 15:51     ` Kumar Gala
2011-03-15 15:51     ` Kumar Gala
2010-08-31 15:48 ` [PATCH 2/4] sound/soc/fsl/p1022_ds.c: " Julia Lawall
2010-08-31 15:48   ` Julia Lawall
2010-08-31 15:48   ` Julia Lawall
2010-08-31 15:59   ` Mark Brown
2010-08-31 15:59     ` [PATCH 2/4] sound/soc/fsl/p1022_ds.c: Add of_node_put to avoid Mark Brown
2010-08-31 15:59     ` [PATCH 2/4] sound/soc/fsl/p1022_ds.c: Add of_node_put to avoid memory leak Mark Brown
2010-09-01 18:39   ` [alsa-devel] " Timur Tabi
2010-09-01 18:39     ` [alsa-devel] [PATCH 2/4] sound/soc/fsl/p1022_ds.c: Add Timur Tabi
2010-09-01 18:49     ` [alsa-devel] [PATCH 2/4] sound/soc/fsl/p1022_ds.c: Add of_node_put to avoid memory leak Liam Girdwood
2010-09-01 18:49       ` [alsa-devel] [PATCH 2/4] sound/soc/fsl/p1022_ds.c: Add Liam Girdwood
2010-09-01 18:49       ` [PATCH 2/4] sound/soc/fsl/p1022_ds.c: Add of_node_put to avoid memory leak Liam Girdwood
2010-09-02 15:30   ` Mark Brown
2010-09-02 15:30     ` [PATCH 2/4] sound/soc/fsl/p1022_ds.c: Add of_node_put to avoid Mark Brown
2010-09-02 15:30     ` [PATCH 2/4] sound/soc/fsl/p1022_ds.c: Add of_node_put to avoid memory leak Mark Brown
2010-08-31 15:48 ` [PATCH 3/4] drivers/net/can/mscan/mpc5xxx_can.c: " Julia Lawall
2010-08-31 15:48   ` Julia Lawall
2010-08-31 15:48   ` Julia Lawall
2010-08-31 16:51   ` Wolfram Sang
2010-08-31 16:51     ` [PATCH 3/4] drivers/net/can/mscan/mpc5xxx_can.c: Add Wolfram Sang
2010-08-31 16:51     ` [PATCH 3/4] drivers/net/can/mscan/mpc5xxx_can.c: Add of_node_put to avoid memory leak Wolfram Sang
2010-08-31 16:55     ` Julia Lawall
2010-08-31 16:55       ` [PATCH 3/4] drivers/net/can/mscan/mpc5xxx_can.c: Add of_node_put Julia Lawall
2010-08-31 17:44     ` [PATCH 3/4] drivers/net/can/mscan/mpc5xxx_can.c: Add of_node_put to avoid memory leak Julia Lawall
2010-08-31 17:44       ` [PATCH 3/4] drivers/net/can/mscan/mpc5xxx_can.c: Add of_node_put Julia Lawall
2010-08-31 17:44       ` [PATCH 3/4] drivers/net/can/mscan/mpc5xxx_can.c: Add of_node_put to avoid memory leak Julia Lawall
2010-08-31 19:10       ` Wolfram Sang
2010-08-31 19:10         ` [PATCH 3/4] drivers/net/can/mscan/mpc5xxx_can.c: Add Wolfram Sang
2010-08-31 19:10         ` [PATCH 3/4] drivers/net/can/mscan/mpc5xxx_can.c: Add of_node_put to avoid memory leak Wolfram Sang
2010-08-31 19:22         ` Wolfgang Grandegger
2010-08-31 19:22           ` [PATCH 3/4] drivers/net/can/mscan/mpc5xxx_can.c: Add of_node_put Wolfgang Grandegger
2010-08-31 19:22           ` [PATCH 3/4] drivers/net/can/mscan/mpc5xxx_can.c: Add of_node_put to avoid memory leak Wolfgang Grandegger
2010-09-01 17:59           ` David Miller
2010-09-01 17:59             ` [PATCH 3/4] drivers/net/can/mscan/mpc5xxx_can.c: Add David Miller
2010-09-01 17:59             ` [PATCH 3/4] drivers/net/can/mscan/mpc5xxx_can.c: Add of_node_put to avoid memory leak David Miller
2010-08-31 15:48 ` Julia Lawall [this message]
2010-08-31 15:48   ` [PATCH 4/4] arch/powerpc/platforms/chrp/nvram.c: " Julia Lawall
2010-08-31 15:48   ` Julia Lawall
2010-09-08 20:00   ` Grant Likely
2010-09-08 20:00     ` Grant Likely
2010-09-08 20:00     ` [PATCH 4/4] arch/powerpc/platforms/chrp/nvram.c: Add Grant Likely
2010-09-08 20:00     ` [PATCH 4/4] arch/powerpc/platforms/chrp/nvram.c: Add of_node_put to avoid memory leak 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=1283269738-14612-5-git-send-email-julia@diku.dk \
    --to=julia@diku.dk \
    --cc=benh@kernel.crashing.org \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=grant.likely@secretlab.ca \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=paulus@samba.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.