From patchwork Wed Jan 27 20:17:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 12050989 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 554DCC433DB for ; Wed, 27 Jan 2021 20:19:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F37B061488 for ; Wed, 27 Jan 2021 20:19:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232199AbhA0UT3 (ORCPT ); Wed, 27 Jan 2021 15:19:29 -0500 Received: from smtp13.smtpout.orange.fr ([80.12.242.135]:31823 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232056AbhA0UT1 (ORCPT ); Wed, 27 Jan 2021 15:19:27 -0500 Received: from localhost.localdomain ([92.131.99.25]) by mwinf5d75 with ME id MwHZ240090Ys01Y03wHaW9; Wed, 27 Jan 2021 21:17:38 +0100 X-ME-Helo: localhost.localdomain X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Wed, 27 Jan 2021 21:17:38 +0100 X-ME-IP: 92.131.99.25 From: Christophe JAILLET To: stanimir.varbanov@linaro.org, agross@kernel.org, bjorn.andersson@linaro.org, mchehab@kernel.org, georgi.djakov@linaro.org Cc: linux-media@vger.kernel.org, linux-arm-msm@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH] media: venus: core: Fix some resource leaks in the error path of 'venus_probe()' Date: Wed, 27 Jan 2021 21:17:32 +0100 Message-Id: <20210127201732.743938-1-christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org If an error occurs after a successful 'of_icc_get()' call, it must be undone by a corresponding 'icc_put()' call. Add it in the error handling path of the probe function as already done in the remove function. Fixes: 32f0a6ddc8c9 ("media: venus: Use on-chip interconnect API") Signed-off-by: Christophe JAILLET --- drivers/media/platform/qcom/venus/core.c | 31 +++++++++++++++++------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 0bde19edac86..8fd5da941067 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -200,27 +200,35 @@ static int venus_probe(struct platform_device *pdev) return PTR_ERR(core->video_path); core->cpucfg_path = of_icc_get(dev, "cpu-cfg"); - if (IS_ERR(core->cpucfg_path)) - return PTR_ERR(core->cpucfg_path); + if (IS_ERR(core->cpucfg_path)) { + ret = PTR_ERR(core->cpucfg_path); + goto err_video_path_put; + } core->irq = platform_get_irq(pdev, 0); - if (core->irq < 0) - return core->irq; + if (core->irq < 0) { + ret = core->irq; + goto err_cpucfg_path_put; + } core->res = of_device_get_match_data(dev); - if (!core->res) - return -ENODEV; + if (!core->res) { + ret = -ENODEV; + goto err_cpucfg_path_put; + } mutex_init(&core->pm_lock); core->pm_ops = venus_pm_get(core->res->hfi_version); - if (!core->pm_ops) - return -ENODEV; + if (!core->pm_ops) { + ret = -ENODEV; + goto err_cpucfg_path_put; + } if (core->pm_ops->core_get) { ret = core->pm_ops->core_get(dev); if (ret) - return ret; + goto err_cpucfg_path_put; } ret = dma_set_mask_and_coherent(dev, core->res->dma_mask); @@ -305,6 +313,11 @@ static int venus_probe(struct platform_device *pdev) err_core_put: if (core->pm_ops->core_put) core->pm_ops->core_put(dev); +err_cpucfg_path_put: + icc_put(core->cpucfg_path); +err_video_path_put: + icc_put(core->video_path); + return ret; }