From patchwork Tue Oct 27 13:48:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 311733 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 96BEEC55178 for ; Tue, 27 Oct 2020 18:25:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3C9032068E for ; Tue, 27 Oct 2020 18:25:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603823133; bh=ToyCB8mOlzlUvQGlaoOa2u6cJZk+wfEy1fgrRDwiyKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TK+Zo3DuO+J9JfbfNt/6BSUNQ0b9vkU7DXB0n1I8AO2bTWOupJg67BAXWywaYDXTA f+HeDCyPcQ6EFV5fwKO+qjJbmg2iJDlghga91W8rG/MOLAj02/DvSYa6xA6F3qlJXz khNVku0jFoW0UqL+P+ijMbsQsGs7oEnmFVyATeqA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753663AbgJ0SVj (ORCPT ); Tue, 27 Oct 2020 14:21:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:50504 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753833AbgJ0OCg (ORCPT ); Tue, 27 Oct 2020 10:02:36 -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 2EA302222C; Tue, 27 Oct 2020 14:02:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603807355; bh=ToyCB8mOlzlUvQGlaoOa2u6cJZk+wfEy1fgrRDwiyKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CwQM3o1RpyOaIWfE2k9w852UAOxsuFR2tAh8P/odRzY43pPfNsX7bPYxOxU624Gm/ pNOBHYb6e+Ts5CSnkdW4g3be8xXBpggh1nyn0cWxE77TfXKV/cWOcGxZX/BrSG5YnT GAOxlDpEoMr33bjPmdkU40s3h+EDJXVyAquLtMd4= 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.9 022/139] media: platform: fcp: Fix a reference count leak. Date: Tue, 27 Oct 2020 14:48:36 +0100 Message-Id: <20201027134903.186342579@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027134902.130312227@linuxfoundation.org> References: <20201027134902.130312227@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 63e36a381d92a9cded97e90d481ee22566557dd1 ] 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. Fixes: 6eaafbdb668b ("[media] v4l: rcar-fcp: Keep the coding style consistent") Signed-off-by: Qiushi Wu Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/rcar-fcp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/rcar-fcp.c b/drivers/media/platform/rcar-fcp.c index 8e9c3bd36d03e..5b5722e65e9b9 100644 --- a/drivers/media/platform/rcar-fcp.c +++ b/drivers/media/platform/rcar-fcp.c @@ -107,8 +107,10 @@ int rcar_fcp_enable(struct rcar_fcp_device *fcp) return 0; ret = pm_runtime_get_sync(fcp->dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_noidle(fcp->dev); return ret; + } return 0; }