From patchwork Tue Oct 27 13:46:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 289715 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=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 CD74EC388F9 for ; Tue, 27 Oct 2020 15:29:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8642D22284 for ; Tue, 27 Oct 2020 15:29:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812551; bh=cu538DtHzMhXc1ZnMXp5c7jVEEq+vs2oCCZEQgiUwII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oJLQZu3y66dJ4Ir3R2Go24jPOGeVaUhfEEZZwpMuNlA/H1nefuG+H55mFQH78vd00 cf4CRXlO0V1KvHpCBEmuMb7pIg5oFk5HazsZ/2E7GTU/UC4Dzm6gSB1ihtRGJxljxW sH1SXgA7+KMVtM2YeVwoukDbM3GjDPcXzD5QW4dM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1798598AbgJ0P3K (ORCPT ); Tue, 27 Oct 2020 11:29:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:40562 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1798010AbgJ0PZ0 (ORCPT ); Tue, 27 Oct 2020 11:25:26 -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 79EBD20657; Tue, 27 Oct 2020 15:25:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812325; bh=cu538DtHzMhXc1ZnMXp5c7jVEEq+vs2oCCZEQgiUwII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lLQCDGga6/m9pLU09xbCR6qMZZUiCs75l90VGwGj7kOQiY+9SVflMpdKQ3r/b+w6q /UIaffq0WULhT0RJaqD/qm57MqMy37eQrUMDR+FvjdSDTYdvIJqibG3rdA2sl2lyNX kEws9LY7m5MWJFYuMzyYZgrvlwfmgl0xuBVxD5Qc= 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 5.9 169/757] media: camss: Fix a reference count leak. Date: Tue, 27 Oct 2020 14:46:59 +0100 Message-Id: <20201027135458.524276033@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@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 d0675b67b42eb4f1a840d1513b5b00f78312f833 ] 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 is not called in error handling paths. Thus call pm_runtime_put_sync() if pm_runtime_get_sync() fails. Fixes: 02afa816dbbf ("media: camss: Add basic runtime PM support") Signed-off-by: Qiushi Wu Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/qcom/camss/camss-csiphy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c index 03ef9c5f4774d..85b24054f35e6 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.c +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c @@ -176,8 +176,10 @@ static int csiphy_set_power(struct v4l2_subdev *sd, int on) int ret; ret = pm_runtime_get_sync(dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_sync(dev); return ret; + } ret = csiphy_set_clock_rates(csiphy); if (ret < 0) {