From patchwork Tue Oct 27 13:48:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 311755 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 0281EC388F9 for ; Tue, 27 Oct 2020 18:18:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BE819207E8 for ; Tue, 27 Oct 2020 18:18:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603822723; bh=4dYIerY6Lyw+agPoGxjvA/z1ZZEJA0SmrHwnIzTauOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Qx1RFCxdnPS5bQiFFpEfYnwfyA7px6SJ0pmEGmT8U1oIyINw8lnNOvlzlfbCByNPO 2GtN9vzEME84EkY9xeL1QvW4hzl/szpH1gsxwNt9pYRsI3BLd2ZLneAwteX6L9EK2x MWBCR8XxjGBet96ozCrX54TlvZsW5yBGSDHasPpw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1813552AbgJ0SSd (ORCPT ); Tue, 27 Oct 2020 14:18:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:59986 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731353AbgJ0OLF (ORCPT ); Tue, 27 Oct 2020 10:11:05 -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 69FA5222EA; Tue, 27 Oct 2020 14:11:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603807865; bh=4dYIerY6Lyw+agPoGxjvA/z1ZZEJA0SmrHwnIzTauOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nIlhnbp1wNiH2sgReRgcGYadzNqZnHgdBrlbvOZgCDv+JCFxlrqVhKt4SY+yyG0nu TehkcSt9ly99Co1i2grEAo+pnmzXtpubckssHx3qUIgtjOiIaCnEhzilyBnuOitmDo +syN3DK4ZYXT7WKKJpnVUiYf0EIJz8suvmgusJrQ= 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.14 038/191] media: s5p-mfc: Fix a reference count leak Date: Tue, 27 Oct 2020 14:48:13 +0100 Message-Id: <20201027134911.567162016@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027134909.701581493@linuxfoundation.org> References: <20201027134909.701581493@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 78741ce98c2e36188e2343434406b0e0bc50b0e7 ] 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: c5086f130a77 ("[media] s5p-mfc: Use clock gating only on MFC v5 hardware") Signed-off-by: Qiushi Wu Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c index 5e080f32b0e82..95abf2bd7ebae 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c @@ -83,8 +83,10 @@ int s5p_mfc_power_on(void) int i, ret = 0; ret = pm_runtime_get_sync(pm->device); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_noidle(pm->device); return ret; + } /* clock control */ for (i = 0; i < pm->num_clocks; i++) {