From patchwork Tue Oct 27 13:49:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 306870 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 0329FC4363A for ; Tue, 27 Oct 2020 18:26:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B84D5206E5 for ; Tue, 27 Oct 2020 18:26:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603823205; bh=/HqbitK00QkLIbbHhw5jTLcPPXOHnA8KQORgGAso0Bw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KuLibZPrXyxXPyeQzpmcAFKCsXmHWp1F20cFsexzdOABbXZXFcXkwkIDgdlYv29Ew 7Sc/2E5zddVElgwclXxEzfEZTeUaHboMHpagIqs7BRITKGQ2vECji4Z1AOCCJO/dF7 nLLnwJEAkzuHDpO8MbSeu2cVP6F3Gu1Z9MOvIVwo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392351AbgJ0OAf (ORCPT ); Tue, 27 Oct 2020 10:00:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:47554 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753546AbgJ0OAG (ORCPT ); Tue, 27 Oct 2020 10:00:06 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 E45DF21D42; Tue, 27 Oct 2020 14:00:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603807206; bh=/HqbitK00QkLIbbHhw5jTLcPPXOHnA8KQORgGAso0Bw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U4dXcdaNle75EUYmuZnbXbRGfhOrhlg3W7jgJHTqOHxhIeyBZeEFo0AhxUPaNsX/0 /JmQQT0gdg5PA0sQmxIcstcLkc5o0SE1W6Z9m1yi5DMvQpg9xvfp+vbyQZ48itVFi8 Zg70O0HSlecnY14uONdGlurtC59lZvNGx5+PKedE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qiushi Wu , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.4 081/112] media: exynos4-is: Fix a reference count leak Date: Tue, 27 Oct 2020 14:49:51 +0100 Message-Id: <20201027134904.380014586@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027134900.532249571@linuxfoundation.org> References: <20201027134900.532249571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Qiushi Wu [ Upstream commit 64157b2cb1940449e7df2670e85781c690266588 ] pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error code, causing incorrect ref count if pm_runtime_put_noidle() is not called in error handling paths. Thus call pm_runtime_put_noidle() if pm_runtime_get_sync() fails. Signed-off-by: Qiushi Wu Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/exynos4-is/mipi-csis.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c index 4b85105dc159b..4f7a0f59f36c2 100644 --- a/drivers/media/platform/exynos4-is/mipi-csis.c +++ b/drivers/media/platform/exynos4-is/mipi-csis.c @@ -513,8 +513,10 @@ static int s5pcsis_s_stream(struct v4l2_subdev *sd, int enable) if (enable) { s5pcsis_clear_counters(state); ret = pm_runtime_get_sync(&state->pdev->dev); - if (ret && ret != 1) + if (ret && ret != 1) { + pm_runtime_put_noidle(&state->pdev->dev); return ret; + } } mutex_lock(&state->lock);