]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
staging, media, easycap: Fix mem leak in easycap_usb_probe()
authorJesper Juhl <jj@chaosbits.net>
Sun, 29 Jan 2012 20:55:28 +0000 (21:55 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Feb 2012 17:51:47 +0000 (09:51 -0800)
If allocating 'pdata_urb' fails, the function will return -ENOMEM
without freeing the memory allocated, just a few lines above, for
'purb' and will leak that memory when 'purb' goes out of scope.

This patch resolves the leak by freeing the allocated storage with
usb_free_urb() before the return.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/media/easycap/easycap_main.c

index 8ff5f38ea1964302af28c1d6d47fba5ffa5f4376..3d439b790cc6d94250ab0f20db63e7c3e9853309 100644 (file)
@@ -3825,6 +3825,7 @@ static int easycap_usb_probe(struct usb_interface *intf,
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
                        pdata_urb = kzalloc(sizeof(struct data_urb), GFP_KERNEL);
                        if (!pdata_urb) {
+                               usb_free_urb(purb);
                                SAM("ERROR: Could not allocate struct data_urb.\n");
                                return -ENOMEM;
                        }