Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8320840ybl; Thu, 16 Jan 2020 14:34:13 -0800 (PST) X-Google-Smtp-Source: APXvYqyxJsQcSPuvwsuRbCbjbvd+eUlEJDBIeZDYlDaB4W201jlgHIEMqblodBEu+WDaWkVGbqM5 X-Received: by 2002:a05:6808:64d:: with SMTP id z13mr1197302oih.104.1579214053748; Thu, 16 Jan 2020 14:34:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579214053; cv=none; d=google.com; s=arc-20160816; b=eyKil6+1D0oOejM/6xMnNbIjERQujUJWAwf1qDsnKT5yFaf7XYmlDznhgCX+uzT1m6 KqZNV7gy3Q4TDoW6/08uG/eOUtpuv+QTCPpESLexiR50Il8SO1M542mLE6AUvtoJ4iON riH40J5micakmMvEuy0yrZ40rssnA0uRVe23kZgYBGxvWntORb7lKvi4/cx5qwMab2fV Mnaq/GXsBpziKdrAVq5WDjloSAs1iWwOTh/MeEAZjGd/4qnWMkA+QtMtEs07Oau8TCVa y278F+IkYZHIbSy31eixW/jsopPsKhhSsIMd/LBdltEJtTDtF8sC7xLAbQgsAUoBF6+n Bprg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=A77SPo0Nn6oXDDALiTY999hsI0lOV8MiDpPO5j2bX+g=; b=gYhO/oQT7DqXkcB2CoDaAY1hJxtFJW9QQxWu4bIA3b7D2kjudWj74td6vwSvJV9aYN Y0ySc8Inhw/2n0GcIkW7LO/wH68C0wh9Bt5wJ4HbYW4dyJIFG2e3y+n5INoJGB6kXJ5z E/lXrmnn2BrLBYFJuFEJmpJKAxhwsrg0euxkd9rrKRw+l3JHAAhMcSN/0Brucng7NHga WmZSY9uXq8xZ5h0jZW8W+5kehW4u0l5Po/pDUNmGvG0DtSBbdQSHKKyjf9fo7HWNT0iA ltIpMYFt0pOohXFEsWf824aHp2zrMQ2F0ZHbs2eHAZfHLiOq6+td+h00GMjo68+5cibs 7y4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="T2IaP5/q"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h11si13454797otr.197.2020.01.16.14.34.01; Thu, 16 Jan 2020 14:34:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="T2IaP5/q"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394942AbgAPSBT (ORCPT + 99 others); Thu, 16 Jan 2020 13:01:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:59204 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405706AbgAPRlc (ORCPT ); Thu, 16 Jan 2020 12:41:32 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DBCF72470B; Thu, 16 Jan 2020 17:41:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196492; bh=PSIyekv9flrRqMwXHw8WZ9qzzBUJ70eDK3NmgkqJndE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T2IaP5/qRc+7rirxqiIvrax1yZ0HHmGxgJnc/BAHl5O4LGqzjGgkrYn6uo/V1zvez egX6VsI1oaERuotuAcS1P/aTjXl2WbwczpXZ5Hdbbiw18Dzf6SyJe4avQp/K4Qn8dP y68kKa2RIJD4vH/f4xN7pblH58TEzB9+W4PT5FjI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Seung-Woo Kim , Sylwester Nawrocki , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 235/251] media: exynos4-is: Fix recursive locking in isp_video_release() Date: Thu, 16 Jan 2020 12:36:24 -0500 Message-Id: <20200116173641.22137-195-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Seung-Woo Kim [ 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 Reviewed-by: Sylwester Nawrocki Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- 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