[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <65EE16ACC360FA4D99C96DC085B3F772221437@039-SN1MPN1-001.039d.mgd.msft.net>
Date: Sun, 21 Aug 2011 13:40:36 +0000
From: Dong Aisheng-B29396 <B29396@...escale.com>
To: Julia Lawall <julia@...u.dk>
CC: Wolfram Sang <w.sang@...gutronix.de>, Liam Girdwood <lrg@...com>,
"kernel-janitors@...r.kernel.org" <kernel-janitors@...r.kernel.org>,
Mark Brown <broonie@...nsource.wolfsonmicro.com>,
Jaroslav Kysela <perex@...ex.cz>, Takashi Iwai <tiwai@...e.de>,
"alsa-devel@...a-project.org" <alsa-devel@...a-project.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: [PATCH] sound/soc/mxs/mxs-saif.c: add missing kfree
> -----Original Message-----
> From: Julia Lawall [mailto:julia@...u.dk]
> Sent: Sunday, August 21, 2011 7:19 PM
> To: Dong Aisheng-B29396
> Cc: Wolfram Sang; Liam Girdwood; kernel-janitors@...r.kernel.org; Mark
> Brown; Jaroslav Kysela; Takashi Iwai; alsa-devel@...a-project.org; linux-
> kernel@...r.kernel.org
> Subject: [PATCH] sound/soc/mxs/mxs-saif.c: add missing kfree
>
> From: Julia Lawall <julia@...u.dk>
>
> Move the test on pdev->id before the kzalloc to avoid requiring kfree
> when the test fails. This fix was suggested by Wolfram Sang.
>
> 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@...u.dk>
>
> ---
> sound/soc/mxs/mxs-saif.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index
> 0b3adae..ab453ca 100644
> --- a/sound/soc/mxs/mxs-saif.c
> +++ b/sound/soc/mxs/mxs-saif.c
> @@ -519,12 +519,13 @@ static int mxs_saif_probe(struct platform_device
> *pdev)
> struct mxs_saif *saif;
> int ret = 0;
>
> + if (pdev->id >= ARRAY_SIZE(mxs_saif))
> + return -EINVAL;
> +
> saif = kzalloc(sizeof(*saif), GFP_KERNEL);
> if (!saif)
> return -ENOMEM;
>
> - if (pdev->id >= ARRAY_SIZE(mxs_saif))
> - return -EINVAL;
> mxs_saif[pdev->id] = saif;
>
> saif->clk = clk_get(&pdev->dev, NULL);
Acked-by: Dong Aisheng <b29396@...escale.com>
Regards
Dong Aisheng
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists