* [PATCH 2/4] sound/soc/ep93xx/ep93xx-i2s.c: add missing kfree
@ 2011-08-20 6:12 Julia Lawall
2011-08-20 7:31 ` Alexander Sverdlin
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Julia Lawall @ 2011-08-20 6:12 UTC (permalink / raw)
To: Liam Girdwood
Cc: kernel-janitors, Mark Brown, Jaroslav Kysela, Takashi Iwai,
Alexander Sverdlin, Ryan Mallon, H Hartley Sweeten, alsa-devel,
linux-kernel
From: Julia Lawall <julia@diku.dk>
Introduce a new label that includes kfree and jump to that one.
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/ep93xx/ep93xx-i2s.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c
index 56efa0c..099614e 100644
--- a/sound/soc/ep93xx/ep93xx-i2s.c
+++ b/sound/soc/ep93xx/ep93xx-i2s.c
@@ -385,14 +385,14 @@ static int ep93xx_i2s_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
err = -ENODEV;
- goto fail;
+ goto fail_free_info;
}
info->mem = request_mem_region(res->start, resource_size(res),
pdev->name);
if (!info->mem) {
err = -EBUSY;
- goto fail;
+ goto fail_free_info;
}
info->regs = ioremap(info->mem->start, resource_size(info->mem));
@@ -435,6 +435,7 @@ fail_unmap_mem:
iounmap(info->regs);
fail_release_mem:
release_mem_region(info->mem->start, resource_size(info->mem));
+fail_free_info:
kfree(info);
fail:
return err;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/4] sound/soc/ep93xx/ep93xx-i2s.c: add missing kfree
2011-08-20 6:12 [PATCH 2/4] sound/soc/ep93xx/ep93xx-i2s.c: add missing kfree Julia Lawall
@ 2011-08-20 7:31 ` Alexander Sverdlin
2011-08-22 16:25 ` H Hartley Sweeten
2011-08-22 22:29 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Alexander Sverdlin @ 2011-08-20 7:31 UTC (permalink / raw)
To: Julia Lawall
Cc: Liam Girdwood, kernel-janitors, Mark Brown, Jaroslav Kysela,
Takashi Iwai, Ryan Mallon, H Hartley Sweeten, alsa-devel,
linux-kernel
Hello!
I believe, fix is correct.
Acked-by: Alexander Sverdlin <subaparts@yandex.ru>
On Sat, 2011-08-20 at 08:12 +0200, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> Introduce a new label that includes kfree and jump to that one.
>
> 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/ep93xx/ep93xx-i2s.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c
> index 56efa0c..099614e 100644
> --- a/sound/soc/ep93xx/ep93xx-i2s.c
> +++ b/sound/soc/ep93xx/ep93xx-i2s.c
> @@ -385,14 +385,14 @@ static int ep93xx_i2s_probe(struct platform_device *pdev)
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> if (!res) {
> err = -ENODEV;
> - goto fail;
> + goto fail_free_info;
> }
>
> info->mem = request_mem_region(res->start, resource_size(res),
> pdev->name);
> if (!info->mem) {
> err = -EBUSY;
> - goto fail;
> + goto fail_free_info;
> }
>
> info->regs = ioremap(info->mem->start, resource_size(info->mem));
> @@ -435,6 +435,7 @@ fail_unmap_mem:
> iounmap(info->regs);
> fail_release_mem:
> release_mem_region(info->mem->start, resource_size(info->mem));
> +fail_free_info:
> kfree(info);
> fail:
> return err;
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH 2/4] sound/soc/ep93xx/ep93xx-i2s.c: add missing kfree
2011-08-20 6:12 [PATCH 2/4] sound/soc/ep93xx/ep93xx-i2s.c: add missing kfree Julia Lawall
2011-08-20 7:31 ` Alexander Sverdlin
@ 2011-08-22 16:25 ` H Hartley Sweeten
2011-08-22 22:29 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: H Hartley Sweeten @ 2011-08-22 16:25 UTC (permalink / raw)
To: Julia Lawall, Liam Girdwood
Cc: kernel-janitors@vger.kernel.org, Mark Brown, Jaroslav Kysela,
Takashi Iwai, Alexander Sverdlin, Ryan Mallon,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
On Friday, August 19, 2011 11:13 PM, Julia Lawall wrote:
>
> Introduce a new label that includes kfree and jump to that one.
>
> 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/ep93xx/ep93xx-i2s.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c
> index 56efa0c..099614e 100644
> --- a/sound/soc/ep93xx/ep93xx-i2s.c
> +++ b/sound/soc/ep93xx/ep93xx-i2s.c
> @@ -385,14 +385,14 @@ static int ep93xx_i2s_probe(struct platform_device *pdev)
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> if (!res) {
> err = -ENODEV;
> - goto fail;
> + goto fail_free_info;
> }
>
> info->mem = request_mem_region(res->start, resource_size(res),
> pdev->name);
> if (!info->mem) {
> err = -EBUSY;
> - goto fail;
> + goto fail_free_info;
> }
>
> info->regs = ioremap(info->mem->start, resource_size(info->mem));
> @@ -435,6 +435,7 @@ fail_unmap_mem:
> iounmap(info->regs);
> fail_release_mem:
> release_mem_region(info->mem->start, resource_size(info->mem));
> +fail_free_info:
> kfree(info);
> fail:
> return err;
Looks correct to me...
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/4] sound/soc/ep93xx/ep93xx-i2s.c: add missing kfree
2011-08-20 6:12 [PATCH 2/4] sound/soc/ep93xx/ep93xx-i2s.c: add missing kfree Julia Lawall
2011-08-20 7:31 ` Alexander Sverdlin
2011-08-22 16:25 ` H Hartley Sweeten
@ 2011-08-22 22:29 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2011-08-22 22:29 UTC (permalink / raw)
To: Julia Lawall
Cc: Liam Girdwood, kernel-janitors, Jaroslav Kysela, Takashi Iwai,
Alexander Sverdlin, Ryan Mallon, H Hartley Sweeten, alsa-devel,
linux-kernel
On Sat, Aug 20, 2011 at 08:12:39AM +0200, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> Introduce a new label that includes kfree and jump to that one.
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-08-22 22:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-20 6:12 [PATCH 2/4] sound/soc/ep93xx/ep93xx-i2s.c: add missing kfree Julia Lawall
2011-08-20 7:31 ` Alexander Sverdlin
2011-08-22 16:25 ` H Hartley Sweeten
2011-08-22 22:29 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox