Re: [PATCH] usb: usbmixer error path fix

[Takashi Iwai]

At Tue, 2 Jan 2007 01:13:46 +0100,
Mariusz Kozlowski wrote:
> 
> Hello,
> 
> 	Without the patch below namelist[0] will not be freed in case
> of kmalloc error.
> 
> Signed-off-by: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>

Thanks, I applied it to ALSA tree now.
This should appear in the next push round...


Takashi

> 
>  sound/usb/usbmixer.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff -upr linux-2.6.20-rc2-mm1-a/sound/usb/usbmixer.c linux-2.6.20-rc2-mm1-b/sound/usb/usbmixer.c
> --- linux-2.6.20-rc2-mm1-a/sound/usb/usbmixer.c	2006-12-24 05:00:32.000000000 +0100
> +++ linux-2.6.20-rc2-mm1-b/sound/usb/usbmixer.c	2007-01-01 23:55:31.000000000 +0100
> @@ -1526,7 +1526,7 @@ static int parse_audio_selector_unit(str
>  		namelist[i] = kmalloc(MAX_ITEM_NAME_LEN, GFP_KERNEL);
>  		if (! namelist[i]) {
>  			snd_printk(KERN_ERR "cannot malloc\n");
> -			while (--i > 0)
> +			while (i--)
>  				kfree(namelist[i]);
>  			kfree(namelist);
>  			kfree(cval);
> 
> 
> -- 
> Regards,
> 
> 	Mariusz Kozlowski
> 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/