lkml.org 
[lkml]   [2020]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 235/251] media: exynos4-is: Fix recursive locking in isp_video_release()
    Date
    From: Seung-Woo Kim <sw0312.kim@samsung.com>

    [ Upstream commit 704c6c80fb471d1bb0ef0d61a94617d1d55743cd ]

    >From isp_video_release(), &isp->video_lock is held and subsequent
    vb2_fop_release() tries to lock vdev->lock which is same with the
    previous one. Replace vb2_fop_release() with _vb2_fop_release() to
    fix the recursive locking.

    Fixes: 1380f5754cb0 ("[media] videobuf2: Add missing lock held on vb2_fop_release")
    Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
    Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/exynos4-is/fimc-isp-video.c
    index e00fa03ddc3e..0c0eec671d49 100644
    --- a/drivers/media/platform/exynos4-is/fimc-isp-video.c
    +++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c
    @@ -316,7 +316,7 @@ static int isp_video_release(struct file *file)
    ivc->streaming = 0;
    }

    - vb2_fop_release(file);
    + _vb2_fop_release(file, NULL);

    if (v4l2_fh_is_singular_file(file)) {
    fimc_pipeline_call(&ivc->ve, close);
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-01-16 19:02    [W:2.789 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site