lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 025/173] media: tw686x: Fix oops on buffer alloc failure
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Krzysztof Ha?asa <khalasa@piap.pl>

    [ Upstream commit 5a1a2f63d840dc2631505b607e11ff65ac1b7d3c ]

    The error path currently calls tw686x_video_free() which requires
    vc->dev to be initialized, causing a NULL dereference on uninitizalized
    channels.

    Fix this by setting the vc->dev fields for all the channels first.

    Fixes: f8afaa8dbc0d ("[media] tw686x: Introduce an interface to support multiple DMA modes")

    Signed-off-by: Krzysztof Ha?asa <khalasa@piap.pl>
    Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/media/pci/tw686x/tw686x-video.c | 11 ++++++++---
    1 file changed, 8 insertions(+), 3 deletions(-)

    --- a/drivers/media/pci/tw686x/tw686x-video.c
    +++ b/drivers/media/pci/tw686x/tw686x-video.c
    @@ -1190,6 +1190,14 @@ int tw686x_video_init(struct tw686x_dev
    return err;
    }

    + /* Initialize vc->dev and vc->ch for the error path */
    + for (ch = 0; ch < max_channels(dev); ch++) {
    + struct tw686x_video_channel *vc = &dev->video_channels[ch];
    +
    + vc->dev = dev;
    + vc->ch = ch;
    + }
    +
    for (ch = 0; ch < max_channels(dev); ch++) {
    struct tw686x_video_channel *vc = &dev->video_channels[ch];
    struct video_device *vdev;
    @@ -1198,9 +1206,6 @@ int tw686x_video_init(struct tw686x_dev
    spin_lock_init(&vc->qlock);
    INIT_LIST_HEAD(&vc->vidq_queued);

    - vc->dev = dev;
    - vc->ch = ch;
    -
    /* default settings */
    err = tw686x_set_standard(vc, V4L2_STD_NTSC);
    if (err)

    \
     
     \ /
      Last update: 2018-09-24 14:23    [W:4.018 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site