From patchwork Tue Oct 27 13:48:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 313112 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 144D6C55179 for ; Tue, 27 Oct 2020 13:58:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BEDBE21D7B for ; Tue, 27 Oct 2020 13:58:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603807083; bh=WFFq5ar3ruMzAMynG5wOyIDaC2NCes//NZXhhXsTGyA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xoE34GcEVKx+ZIvzTNz6qVlCWQcorcAlZj6ZOgz4ogxCI/OoT4CN4z7s8Ir8MmYYf QmQpdfg3qekxF9QK7T/t5kw60uHfNgQge/Uwf0cahm8Q6jK5rWnZOlvcH5StihAwYA sZMFIWfzsol6W6o+DHVgMOu9jrLl4f3O/pTcC61s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752979AbgJ0N54 (ORCPT ); Tue, 27 Oct 2020 09:57:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:45056 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752974AbgJ0N54 (ORCPT ); Tue, 27 Oct 2020 09:57:56 -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 1F9692072D; Tue, 27 Oct 2020 13:57:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603807075; bh=WFFq5ar3ruMzAMynG5wOyIDaC2NCes//NZXhhXsTGyA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WS3VHgWathQzt2yMDnWcwMR/3r2AHiGnhCZQ+cuFDAsZugP7sj5erI3SV+uWgptsn Xr3YzDPdbClFzZJi91gU33QzIAE/Y3ajKsUDnxoeTUJOPwS/pcFdMpioBBCVe3RdEw 1T8fWnENUVoPZY+6iKLjj5tEtI/RTAzMYk1rzZPs= 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 026/112] media: ti-vpe: Fix a missing check and reference count leak Date: Tue, 27 Oct 2020 14:48:56 +0100 Message-Id: <20201027134901.797253435@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 7dae2aaaf432767ca7aa11fa84643a7c2600dbdd ] 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. And also, when the call of function vpe_runtime_get() failed, we won't call vpe_runtime_put(). Thus call pm_runtime_put_noidle() if pm_runtime_get_sync() fails inside vpe_runtime_get(). Fixes: 4571912743ac ("[media] v4l: ti-vpe: Add VPE mem to mem driver") Signed-off-by: Qiushi Wu Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/ti-vpe/vpe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/ti-vpe/vpe.c index b5f8c425cd2ef..8a3714bfb77e8 100644 --- a/drivers/media/platform/ti-vpe/vpe.c +++ b/drivers/media/platform/ti-vpe/vpe.c @@ -2135,6 +2135,8 @@ static int vpe_runtime_get(struct platform_device *pdev) r = pm_runtime_get_sync(&pdev->dev); WARN_ON(r < 0); + if (r) + pm_runtime_put_noidle(&pdev->dev); return r < 0 ? r : 0; }