* [PATCH 1/4] sound/soc/kirkwood/kirkwood-i2s.c: add missing kfree
@ 2011-08-20 6:12 Julia Lawall
2011-08-22 10:17 ` Liam Girdwood
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Julia Lawall @ 2011-08-20 6:12 UTC (permalink / raw)
To: Liam Girdwood
Cc: alsa-devel, Greg Kroah-Hartman, Takashi Iwai, Mark Brown,
kernel-janitors, linux-kernel, Arnaud Patard
From: Julia Lawall <julia@diku.dk>
Adjust the goto to jump to the error handling code that includes kfree.
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 != kfree(x)
when != x = E3
when != E3 = x
* return ...;
}
... when != x = E2
when != I(...,x,...) S
if (...) { ... when != x = E4
kfree(x); ... return ...; }
)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index a33fc51..8f16cd3 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -424,7 +424,7 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev)
if (!priv->mem) {
dev_err(&pdev->dev, "request_mem_region failed\n");
err = -EBUSY;
- goto error;
+ goto error_alloc;
}
priv->io = ioremap(priv->mem->start, SZ_16K);
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/4] sound/soc/kirkwood/kirkwood-i2s.c: add missing kfree
2011-08-20 6:12 [PATCH 1/4] sound/soc/kirkwood/kirkwood-i2s.c: add missing kfree Julia Lawall
@ 2011-08-22 10:17 ` Liam Girdwood
2011-08-22 22:29 ` Mark Brown
2011-09-11 18:07 ` [PATCH] sound/soc/kirkwood/kirkwood-i2s.c: fix trivial build regression Arnd Bergmann
2 siblings, 0 replies; 5+ messages in thread
From: Liam Girdwood @ 2011-08-22 10:17 UTC (permalink / raw)
To: Julia Lawall
Cc: alsa-devel@alsa-project.org, Greg Kroah-Hartman, Takashi Iwai,
Brown, kernel-janitors@vger.kernel.org,
linux-kernel@vger.kernel.org, Mark, Arnaud Patard
On 20/08/11 07:12, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> Adjust the goto to jump to the error handling code that includes kfree.
>
> 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 != kfree(x)
> when != x = E3
> when != E3 = x
> * return ...;
> }
> ... when != x = E2
> when != I(...,x,...) S
> if (...) { ... when != x = E4
> kfree(x); ... return ...; }
> )
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia@diku.dk>
>
> ---
> sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
> index a33fc51..8f16cd3 100644
> --- a/sound/soc/kirkwood/kirkwood-i2s.c
> +++ b/sound/soc/kirkwood/kirkwood-i2s.c
> @@ -424,7 +424,7 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev)
> if (!priv->mem) {
> dev_err(&pdev->dev, "request_mem_region failed\n");
> err = -EBUSY;
> - goto error;
> + goto error_alloc;
> }
>
> priv->io = ioremap(priv->mem->start, SZ_16K);
>
All
Acked-by: Liam Girdwood <lrg@ti.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/4] sound/soc/kirkwood/kirkwood-i2s.c: add missing kfree
2011-08-20 6:12 [PATCH 1/4] sound/soc/kirkwood/kirkwood-i2s.c: add missing kfree Julia Lawall
2011-08-22 10:17 ` Liam Girdwood
@ 2011-08-22 22:29 ` Mark Brown
2011-09-11 18:07 ` [PATCH] sound/soc/kirkwood/kirkwood-i2s.c: fix trivial build regression Arnd Bergmann
2 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2011-08-22 22:29 UTC (permalink / raw)
To: Julia Lawall
Cc: alsa-devel, Takashi Iwai, Greg Kroah-Hartman, kernel-janitors,
linux-kernel, Liam Girdwood, Arnaud Patard
On Sat, Aug 20, 2011 at 08:12:38AM +0200, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> Adjust the goto to jump to the error handling code that includes kfree.
>
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
Applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] sound/soc/kirkwood/kirkwood-i2s.c: fix trivial build regression
2011-08-20 6:12 [PATCH 1/4] sound/soc/kirkwood/kirkwood-i2s.c: add missing kfree Julia Lawall
2011-08-22 10:17 ` Liam Girdwood
2011-08-22 22:29 ` Mark Brown
@ 2011-09-11 18:07 ` Arnd Bergmann
2011-09-12 10:49 ` [PATCH] sound/soc/kirkwood/kirkwood-i2s.c: fix trivial build Mark Brown
2 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2011-09-11 18:07 UTC (permalink / raw)
To: Julia Lawall
Cc: alsa-devel, Greg Kroah-Hartman, Takashi Iwai, Mark Brown,
kernel-janitors, linux-kernel, Liam Girdwood, Arnaud Patard
A fix merged in 3.1-rc2 introduced a small regression, this should get it
to build again.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
On Saturday 20 August 2011 08:12:38 Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> Adjust the goto to jump to the error handling code that includes kfree.
>
/home/arnd/linux-arm/sound/soc/kirkwood/kirkwood-i2s.c: In function 'kirkwood_i2s_dev_probe':
/home/arnd/linux-arm/sound/soc/kirkwood/kirkwood-i2s.c:427:3: error: label 'error_alloc' used but not defined
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 8f16cd3..d0bcf3f 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -424,7 +424,7 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev)
if (!priv->mem) {
dev_err(&pdev->dev, "request_mem_region failed\n");
err = -EBUSY;
- goto error_alloc;
+ goto err_alloc;
}
priv->io = ioremap(priv->mem->start, SZ_16K);
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] sound/soc/kirkwood/kirkwood-i2s.c: fix trivial build
2011-09-11 18:07 ` [PATCH] sound/soc/kirkwood/kirkwood-i2s.c: fix trivial build regression Arnd Bergmann
@ 2011-09-12 10:49 ` Mark Brown
0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2011-09-12 10:49 UTC (permalink / raw)
To: Arnd Bergmann
Cc: alsa-devel, Takashi Iwai, Greg Kroah-Hartman, kernel-janitors,
linux-kernel, Julia Lawall, Liam Girdwood, Arnaud Patard
On Sun, Sep 11, 2011 at 08:07:30PM +0200, Arnd Bergmann wrote:
> A fix merged in 3.1-rc2 introduced a small regression, this should get it
> to build again.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Applied, thanks.
Please try to make sure that your commit logs match the style of the
subsystem.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-09-12 10:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-20 6:12 [PATCH 1/4] sound/soc/kirkwood/kirkwood-i2s.c: add missing kfree Julia Lawall
2011-08-22 10:17 ` Liam Girdwood
2011-08-22 22:29 ` Mark Brown
2011-09-11 18:07 ` [PATCH] sound/soc/kirkwood/kirkwood-i2s.c: fix trivial build regression Arnd Bergmann
2011-09-12 10:49 ` [PATCH] sound/soc/kirkwood/kirkwood-i2s.c: fix trivial build 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).