]> err.no Git - linux-2.6/commitdiff
V4L/DVB (4990): Cpia2/cpia2_usb.c: fix error-path leak
authorAmit Choudhary <amit2030@gmail.com>
Wed, 20 Dec 2006 12:30:45 +0000 (09:30 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 27 Dec 2006 16:19:51 +0000 (14:19 -0200)
Free previously allocated memory (in array elements) if kmalloc() returns
NULL in submit_urbs().

Signed-off-by: Amit Choudhary <amit2030@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/cpia2/cpia2_usb.c

index 28dc6a1a1e43b0156b5de717f044d5782de39315..d8e929863a88d9305ecaefff2b8378fd06b9d374 100644 (file)
@@ -640,6 +640,10 @@ static int submit_urbs(struct camera_data *cam)
                cam->sbuf[i].data =
                    kmalloc(FRAMES_PER_DESC * FRAME_SIZE_PER_DESC, GFP_KERNEL);
                if (!cam->sbuf[i].data) {
+                       while (--i >= 0) {
+                               kfree(cam->sbuf[i].data);
+                               cam->sbuf[i].data = NULL;
+                       }
                        return -ENOMEM;
                }
        }