[3/8] drivers/media/video/hdpvr: introduce missing kfree

Commit Message

Janne Grunau Sept. 16, 2009, 11:13 a.m. UTC

On Fri, Sep 11, 2009 at 06:21:35PM +0200, Julia Lawall wrote:
> 
> Error handling code following a kzalloc should free the allocated data.

Thanks for the report. I'll commit a different patch which adds the buffer
to the buffer list as soon it is allocated. The hdpvr_free_buffers() in the
error handling code will clean it up then. See below:

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/linux/drivers/media/video/hdpvr/hdpvr-video.c b/linux/drivers/media/video/hdpvr/hdpvr-video.c
--- a/linux/drivers/media/video/hdpvr/hdpvr-video.c
+++ b/linux/drivers/media/video/hdpvr/hdpvr-video.c
@@ -134,6 +134,8 @@ 
                        v4l2_err(&dev->v4l2_dev, "cannot allocate buffer\n");
                        goto exit;
                }
+               list_add_tail(&buf->buff_list, &dev->free_buff_list);
+
                buf->dev = dev;

                urb = usb_alloc_urb(0, GFP_KERNEL);
@@ -158,7 +160,6 @@ 
                                  hdpvr_read_bulk_callback, buf);

                buf->status = BUFSTAT_AVAILABLE;
-               list_add_tail(&buf->buff_list, &dev->free_buff_list);
        }
        return 0;
 exit: