[PATCH v2] sound: soc: fsl: Fix memory leak in imx-audmux.c

[PATCH v2] sound: soc: fsl: Fix memory leak in imx-audmux.c

[Felipe Pena]

When audmux_clk is used and clk_prepare_enable function succeed,
the memory alloc'd to buf variable is leaked

Signed-off-by: Felipe Pena <felipensp@gmail.com>
---
 sound/soc/fsl/imx-audmux.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index d3bf71a..ac86993 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -66,13 +66,10 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
 				size_t count, loff_t *ppos)
 {
 	ssize_t ret;
-	char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+	char *buf;
 	int port = (int)file->private_data;
 	u32 pdcr, ptcr;
 
-	if (!buf)
-		return -ENOMEM;
-
 	if (audmux_clk) {
 		ret = clk_prepare_enable(audmux_clk);
 		if (ret)
@@ -85,6 +82,10 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
 	if (audmux_clk)
 		clk_disable_unprepare(audmux_clk);
 
+	buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+	if (!buf)
+		return -ENOMEM;
+
 	ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n",
 		       pdcr, ptcr);
 
-- 
1.7.10.4

Re: [alsa-devel] [PATCH v2] sound: soc: fsl: Fix memory leak in imx-audmux.c

[Sascha Hauer]

On Sat, Oct 12, 2013 at 07:35:06PM -0300, Felipe Pena wrote:
> When audmux_clk is used and clk_prepare_enable function succeed,
> the memory alloc'd to buf variable is leaked
> 
> Signed-off-by: Felipe Pena <felipensp@gmail.com>

Looks good.

Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>

If you send a v2 please next time also write what changed to the
previous version.

Sascha

> ---
>  sound/soc/fsl/imx-audmux.c |    9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
> index d3bf71a..ac86993 100644
> --- a/sound/soc/fsl/imx-audmux.c
> +++ b/sound/soc/fsl/imx-audmux.c
> @@ -66,13 +66,10 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
>  				size_t count, loff_t *ppos)
>  {
>  	ssize_t ret;
> -	char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
> +	char *buf;
>  	int port = (int)file->private_data;
>  	u32 pdcr, ptcr;
>  
> -	if (!buf)
> -		return -ENOMEM;
> -
>  	if (audmux_clk) {
>  		ret = clk_prepare_enable(audmux_clk);
>  		if (ret)
> @@ -85,6 +82,10 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
>  	if (audmux_clk)
>  		clk_disable_unprepare(audmux_clk);
>  
> +	buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
> +	if (!buf)
> +		return -ENOMEM;
> +
>  	ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n",
>  		       pdcr, ptcr);
>  
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH v2] sound: soc: fsl: Fix memory leak in imx-audmux.c

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 464 bytes --]

On Sat, Oct 12, 2013 at 07:35:06PM -0300, Felipe Pena wrote:
> When audmux_clk is used and clk_prepare_enable function succeed,
> the memory alloc'd to buf variable is leaked

Applied, thanks.  Please try to use subject lines appropriate for the
subsystem and keep your CC lists focused - you want to send to
maintainers and people working on the specific code but it's best to
avoid people working on tree wide cleanups like Bill so they don't get
too much spam.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH v2] sound: soc: fsl: Fix memory leak in imx-audmux.c

[Felipe Pena]

Hi,

On Mon, Oct 14, 2013 at 8:59 AM, Mark Brown <broonie@kernel.org> wrote:
> On Sat, Oct 12, 2013 at 07:35:06PM -0300, Felipe Pena wrote:
>> When audmux_clk is used and clk_prepare_enable function succeed,
>> the memory alloc'd to buf variable is leaked
>
> Applied, thanks.  Please try to use subject lines appropriate for the
> subsystem and keep your CC lists focused - you want to send to
> maintainers and people working on the specific code but it's best to
> avoid people working on tree wide cleanups like Bill so they don't get
> too much spam.

Thanks guys for accepting the patch. Sorry for inconvenience about the
subject line.

About the CC list I just use the one that I get from scripts/get_maintainer.pl.

-- 
Regards,
Felipe Pena

Re: [PATCH v2] sound: soc: fsl: Fix memory leak in imx-audmux.c

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 399 bytes --]

On Mon, Oct 14, 2013 at 09:05:44AM -0300, Felipe Pena wrote:

> About the CC list I just use the one that I get from scripts/get_maintainer.pl.

Yeah, that's the most common reason - get_maintianer tends to pick up
extra people.  You really need to look at the list of people it
generates and why they're there, if they're there due to git commits
they might just have been doing some generic work.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]