lkml.org 
[lkml]   [2013]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 66/93] [media] hdpvr: fix iteration over uninitialized lists in hdpvr_probe()
    Date
    3.8.13.10 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alexey Khoroshilov <khoroshilov@ispras.ru>

    commit 2e923a0527ac439e135b9961e58d3acd876bba10 upstream.

    free_buff_list and rec_buff_list are initialized in the middle of hdpvr_probe(),
    but if something bad happens before that, error handling code calls hdpvr_delete(),
    which contains iteration over the lists (via hdpvr_free_buffers()).
    The patch moves the lists initialization to the beginning and by the way fixes
    goto label in error handling of registering videodev.
    Found by Linux Driver Verification project (linuxtesting.org).

    Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
    Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
    Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
    [ kamal: backport to 3.8 (context) ]
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/media/usb/hdpvr/hdpvr-core.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c
    index 84dc26f..e35fab4 100644
    --- a/drivers/media/usb/hdpvr/hdpvr-core.c
    +++ b/drivers/media/usb/hdpvr/hdpvr-core.c
    @@ -309,6 +309,11 @@ static int hdpvr_probe(struct usb_interface *interface,

    dev->workqueue = 0;

    + /* init video transfer queues first of all */
    + /* to prevent oops in hdpvr_delete() on error paths */
    + INIT_LIST_HEAD(&dev->free_buff_list);
    + INIT_LIST_HEAD(&dev->rec_buff_list);
    +
    /* register v4l2_device early so it can be used for printks */
    if (v4l2_device_register(&interface->dev, &dev->v4l2_dev)) {
    dev_err(&interface->dev, "v4l2_device_register failed\n");
    @@ -331,10 +336,6 @@ static int hdpvr_probe(struct usb_interface *interface,
    if (!dev->workqueue)
    goto error;

    - /* init video transfer queues */
    - INIT_LIST_HEAD(&dev->free_buff_list);
    - INIT_LIST_HEAD(&dev->rec_buff_list);
    -
    dev->options = hdpvr_default_options;

    if (default_video_input < HDPVR_VIDEO_INPUTS)
    @@ -388,7 +389,7 @@ static int hdpvr_probe(struct usb_interface *interface,
    if (hdpvr_register_videodev(dev, &interface->dev,
    video_nr[atomic_inc_return(&dev_nr)])) {
    v4l2_err(&dev->v4l2_dev, "registering videodev failed\n");
    - goto error;
    + goto reg_fail;
    }

    #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-09-20 22:41    [W:4.157 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site