From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BE8CC33CB3 for ; Thu, 16 Jan 2020 23:25:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D577320684 for ; Thu, 16 Jan 2020 23:25:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217135; bh=DkoLv/PPBCvriwWEPqQKsa4fsMQaQV3G/CykgTUgzik=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YhZysQjsY5fPgqGO71aulXj62rRwVnrHFDpjEdvHZN3nAnvZ784XDaXauZUlRApvd oECeRenrVxMv4DHx4u07QalojbrIvKWh8YCIwzf//dUG/b4oQIsC/cvEwalClB69sz 9HR4beSr8TXQK9x51azVlGV2hmk0X4MZTQh4TvFo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733265AbgAPXZf (ORCPT ); Thu, 16 Jan 2020 18:25:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:54754 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388038AbgAPXZN (ORCPT ); Thu, 16 Jan 2020 18:25:13 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7A0192075B; Thu, 16 Jan 2020 23:25:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217112; bh=DkoLv/PPBCvriwWEPqQKsa4fsMQaQV3G/CykgTUgzik=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w5Dp8JpZYX23HeKVjqg+LzQjV5daeub6qobc9Nf0bNlpStquoVGxP//400egx4JTc iKNWE/NWBSfR+4/P0BN51nZIuUQp1MNP2vmSaZHWSVbT7tnBEItw4nJLihcuvAB26E H44kNAphdtyXrZWUM8lWHBYB83ptUlo9UgvYERmk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Seung-Woo Kim , Sylwester Nawrocki , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 5.4 153/203] media: exynos4-is: Fix recursive locking in isp_video_release() Date: Fri, 17 Jan 2020 00:17:50 +0100 Message-Id: <20200116231758.222710009@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200116231745.218684830@linuxfoundation.org> References: <20200116231745.218684830@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Seung-Woo Kim commit 704c6c80fb471d1bb0ef0d61a94617d1d55743cd upstream. >>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 Reviewed-by: Sylwester Nawrocki Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/media/platform/exynos4-is/fimc-isp-video.c +++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c @@ -313,7 +313,7 @@ static int isp_video_release(struct 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);