summaryrefslogtreecommitdiff
path: root/drivers/staging/media
diff options
context:
space:
mode:
authorJesper Juhl <jj@chaosbits.net>2012-01-29 19:55:28 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-02-08 14:38:57 (GMT)
commit9fa728ea35501fb5cd56880839ad867265c61822 (patch)
tree1cd006be56640036e6db87da0d3052e47b08022b /drivers/staging/media
parent41292b16117bdd8e1321223b6a14e86aa1cb5fbb (diff)
downloadlinux-fsl-qoriq-9fa728ea35501fb5cd56880839ad867265c61822.tar.xz
[media] easycap: Fix mem leak in easycap_usb_probe()
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: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/media')
-rw-r--r--drivers/staging/media/easycap/easycap_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/media/easycap/easycap_main.c b/drivers/staging/media/easycap/easycap_main.c
index 8ff5f38..3d439b7 100644
--- a/drivers/staging/media/easycap/easycap_main.c
+++ b/drivers/staging/media/easycap/easycap_main.c
@@ -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;
}