lkml.org 
[lkml]   [2020]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 36/91] media: davinci: vpif_capture: fix potential double free
    Date
    From: Evgeny Novikov <novikov@ispras.ru>

    [ Upstream commit 602649eadaa0c977e362e641f51ec306bc1d365d ]

    In case of errors vpif_probe_complete() releases memory for vpif_obj.sd
    and unregisters the V4L2 device. But then this is done again by
    vpif_probe() itself. The patch removes the cleaning from
    vpif_probe_complete().

    Found by Linux Driver Verification project (linuxtesting.org).

    Signed-off-by: Evgeny Novikov <novikov@ispras.ru>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/davinci/vpif_capture.c | 2 --
    1 file changed, 2 deletions(-)

    diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
    index dc8fc2120b63f..acc52d28c5c45 100644
    --- a/drivers/media/platform/davinci/vpif_capture.c
    +++ b/drivers/media/platform/davinci/vpif_capture.c
    @@ -1489,8 +1489,6 @@ probe_out:
    /* Unregister video device */
    video_unregister_device(&ch->video_dev);
    }
    - kfree(vpif_obj.sd);
    - v4l2_device_unregister(&vpif_obj.v4l2_dev);

    return err;
    }
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-09-01 19:05    [W:6.189 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site