* [PATCH 1/2] sound/soc/fsl/p1022_ds.c: add missing of_node_put
@ 2011-08-20 7:02 Julia Lawall
2011-08-22 10:18 ` Liam Girdwood
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Julia Lawall @ 2011-08-20 7:02 UTC (permalink / raw)
To: Liam Girdwood
Cc: alsa-devel, Takashi Iwai, devicetree-discuss, Mark Brown,
kernel-janitors, linux-kernel, Grant Likely, Axel Lin, Timur Tabi
From: Julia Lawall <julia@diku.dk>
dma_channel_np has been accessed at this point, so decrease its reference
count before leaving the function.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier x;
expression E1!=0,E2,E3,E4;
statement S;
iterator I;
@@
(
if (...) { ... when != of_node_put(x)
when != x = E3
when != E3 = x
* return ...;
}
... when != x = E2
when != I(...,x,...) S
if (...) { ... when != x = E4
of_node_put(x); ... return ...; }
)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
sound/soc/fsl/p1022_ds.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c
index 8fa4d5f..fcb862e 100644
--- a/sound/soc/fsl/p1022_ds.c
+++ b/sound/soc/fsl/p1022_ds.c
@@ -297,8 +297,10 @@ static int get_dma_channel(struct device_node *ssi_np,
* dai->platform name should already point to an allocated buffer.
*/
ret = of_address_to_resource(dma_channel_np, 0, &res);
- if (ret)
+ if (ret) {
+ of_node_put(dma_channel_np);
return ret;
+ }
snprintf((char *)dai->platform_name, DAI_NAME_SIZE, "%llx.%s",
(unsigned long long) res.start, dma_channel_np->name);
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] sound/soc/fsl/p1022_ds.c: add missing of_node_put
2011-08-20 7:02 [PATCH 1/2] sound/soc/fsl/p1022_ds.c: add missing of_node_put Julia Lawall
@ 2011-08-22 10:18 ` Liam Girdwood
2011-08-22 13:55 ` Timur Tabi
2011-08-22 22:30 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Liam Girdwood @ 2011-08-22 10:18 UTC (permalink / raw)
To: Julia Lawall
Cc: alsa-devel@alsa-project.org, Takashi Iwai,
devicetree-discuss@lists.ozlabs.org, Brown,
kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org,
Grant Likely, Axel Lin, Mark, Timur Tabi
On 20/08/11 08:02, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> dma_channel_np has been accessed at this point, so decrease its reference
> count before leaving the function.
>
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> identifier x;
> expression E1!=0,E2,E3,E4;
> statement S;
> iterator I;
> @@
>
> (
> if (...) { ... when != of_node_put(x)
> when != x = E3
> when != E3 = x
> * return ...;
> }
> ... when != x = E2
> when != I(...,x,...) S
> if (...) { ... when != x = E4
> of_node_put(x); ... return ...; }
> )
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia@diku.dk>
>
> ---
> sound/soc/fsl/p1022_ds.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c
> index 8fa4d5f..fcb862e 100644
> --- a/sound/soc/fsl/p1022_ds.c
> +++ b/sound/soc/fsl/p1022_ds.c
> @@ -297,8 +297,10 @@ static int get_dma_channel(struct device_node *ssi_np,
> * dai->platform name should already point to an allocated buffer.
> */
> ret = of_address_to_resource(dma_channel_np, 0, &res);
> - if (ret)
> + if (ret) {
> + of_node_put(dma_channel_np);
> return ret;
> + }
> snprintf((char *)dai->platform_name, DAI_NAME_SIZE, "%llx.%s",
> (unsigned long long) res.start, dma_channel_np->name);
>
>
Both
Acked-by: Liam Girdwood <lrg@ti.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] sound/soc/fsl/p1022_ds.c: add missing of_node_put
2011-08-20 7:02 [PATCH 1/2] sound/soc/fsl/p1022_ds.c: add missing of_node_put Julia Lawall
2011-08-22 10:18 ` Liam Girdwood
@ 2011-08-22 13:55 ` Timur Tabi
2011-08-22 22:30 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Timur Tabi @ 2011-08-22 13:55 UTC (permalink / raw)
To: Julia Lawall
Cc: alsa-devel, Takashi Iwai, devicetree-discuss, Mark Brown,
kernel-janitors, linux-kernel, Grant Likely, Axel, Lin,
Liam Girdwood
Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> dma_channel_np has been accessed at this point, so decrease its reference
> count before leaving the function.
>
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> identifier x;
> expression E1!=0,E2,E3,E4;
> statement S;
> iterator I;
> @@
>
> (
> if (...) { ... when != of_node_put(x)
> when != x = E3
> when != E3 = x
> * return ...;
> }
> ... when != x = E2
> when != I(...,x,...) S
> if (...) { ... when != x = E4
> of_node_put(x); ... return ...; }
> )
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Timur Tabi <timur@freescale.com>
Thanks, Julia.
--
Timur Tabi
Linux kernel developer at Freescale
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] sound/soc/fsl/p1022_ds.c: add missing of_node_put
2011-08-20 7:02 [PATCH 1/2] sound/soc/fsl/p1022_ds.c: add missing of_node_put Julia Lawall
2011-08-22 10:18 ` Liam Girdwood
2011-08-22 13:55 ` Timur Tabi
@ 2011-08-22 22:30 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2011-08-22 22:30 UTC (permalink / raw)
To: Julia Lawall
Cc: alsa-devel, Takashi Iwai, devicetree-discuss, kernel-janitors,
linux-kernel, Liam Girdwood, Grant Likely, Axel Lin, Timur Tabi
On Sat, Aug 20, 2011 at 09:02:00AM +0200, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> dma_channel_np has been accessed at this point, so decrease its reference
> count before leaving the function.
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-08-22 22:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-20 7:02 [PATCH 1/2] sound/soc/fsl/p1022_ds.c: add missing of_node_put Julia Lawall
2011-08-22 10:18 ` Liam Girdwood
2011-08-22 13:55 ` Timur Tabi
2011-08-22 22:30 ` Mark Brown
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).