From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B36F326B087; Thu, 13 Feb 2025 15:32:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739460752; cv=none; b=GHXPRR7m8O58JiXzmrNaPJaKhIOxlo61B5WVnVTHdbjFyH3JRt9DFbBUedCRntQ9SVhvCfi1Qxme5ErsKA38tt88QK3wSSOv2SBLRwco741XjfstnYDiS5bpQoDD328hBdQiJXsMImel6WAB3cP9eVqNE3hSCl8KnTPBeYImC6c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739460752; c=relaxed/simple; bh=kl05zxWiEsgs/kFAREcHrc9uuWesOaXmzAUXQHdsOEY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h47FQ/mh5V0s8p93qnexL4zDMsNB65qVD/gS6GLmXniR4xpGFla6+FDVfFW0sRiMtL9kDWuy9kfvbH+cjKtmsprod30/F8Fwtvpe9Vj0TQlFGXbVxF1K4E3tRl8TtWaJPygly2Z0RWPYW/z97mydKkXCwMHMo/jmuGUZghIzkXM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cVTH9AbU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cVTH9AbU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25333C4CED1; Thu, 13 Feb 2025 15:32:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739460752; bh=kl05zxWiEsgs/kFAREcHrc9uuWesOaXmzAUXQHdsOEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cVTH9AbULMKANRyUYxbVmUEWLoEd3i6NN8jdRTxBOCfO4tgJfBntqP7L0WW3pMioC QCJXwbRe6wCppAJEUNXQdCCwTxiMYC3u5MH0zUC9K3+Ei7Q0L9OiRqQTc2StLqHLgY zqwdj/U1WP8rWwE5j6q3nxiYVOVFJfspcvQYJcWk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Krzysztof Kozlowski , AngeloGioacchino Del Regno Subject: [PATCH 6.6 201/273] soc: mediatek: mtk-devapc: Fix leaking IO map on error paths Date: Thu, 13 Feb 2025 15:29:33 +0100 Message-ID: <20250213142415.267482206@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250213142407.354217048@linuxfoundation.org> References: <20250213142407.354217048@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Krzysztof Kozlowski commit c0eb059a4575ed57f265d9883a5203799c19982c upstream. Error paths of mtk_devapc_probe() should unmap the memory. Reported by Smatch: drivers/soc/mediatek/mtk-devapc.c:292 mtk_devapc_probe() warn: 'ctx->infra_base' from of_iomap() not released on lines: 277,281,286. Fixes: 0890beb22618 ("soc: mediatek: add mt6779 devapc driver") Cc: stable@vger.kernel.org Signed-off-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/20250104142012.115974-1-krzysztof.kozlowski@linaro.org Signed-off-by: AngeloGioacchino Del Regno Signed-off-by: Greg Kroah-Hartman --- drivers/soc/mediatek/mtk-devapc.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) --- a/drivers/soc/mediatek/mtk-devapc.c +++ b/drivers/soc/mediatek/mtk-devapc.c @@ -273,23 +273,31 @@ static int mtk_devapc_probe(struct platf return -EINVAL; devapc_irq = irq_of_parse_and_map(node, 0); - if (!devapc_irq) - return -EINVAL; + if (!devapc_irq) { + ret = -EINVAL; + goto err; + } ctx->infra_clk = devm_clk_get_enabled(&pdev->dev, "devapc-infra-clock"); - if (IS_ERR(ctx->infra_clk)) - return -EINVAL; + if (IS_ERR(ctx->infra_clk)) { + ret = -EINVAL; + goto err; + } ret = devm_request_irq(&pdev->dev, devapc_irq, devapc_violation_irq, IRQF_TRIGGER_NONE, "devapc", ctx); if (ret) - return ret; + goto err; platform_set_drvdata(pdev, ctx); start_devapc(ctx); return 0; + +err: + iounmap(ctx->infra_base); + return ret; } static int mtk_devapc_remove(struct platform_device *pdev)