soc: mediatek: mtk-devapc: Fix leaking IO map on error paths

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>

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@xxxxxxxxxxxxxxx
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20250104142012.115974-1-krzysztof.kozlowski@xxxxxxxxxx
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
 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)


Patches currently in stable-queue which might be from krzysztof.kozlowski@xxxxxxxxxx are

queue-6.6/arm64-dts-qcom-sm6350-fix-mpss-memory-length.patch
queue-6.6/arm64-dts-qcom-sm8350-fix-cdsp-memory-base-and-length.patch
queue-6.6/arm64-dts-qcom-sm6115-fix-mpss-memory-length.patch
queue-6.6/arm64-dts-qcom-sm8350-fix-mpss-memory-length.patch
queue-6.6/arm64-dts-qcom-sm6375-fix-adsp-memory-length.patch
queue-6.6/soc-qcom-smem_state-fix-missing-of_node_put-in-error-path.patch
queue-6.6/arm64-dts-qcom-sm6350-fix-adsp-memory-length.patch
queue-6.6/arm64-dts-qcom-sm8450-fix-cdsp-memory-length.patch
queue-6.6/arm64-dts-qcom-sm6375-fix-cdsp-memory-base-and-length.patch
queue-6.6/soc-mediatek-mtk-devapc-fix-leaking-io-map-on-error-paths.patch
queue-6.6/arm64-dts-qcom-sm8550-fix-mpss-memory-length.patch
queue-6.6/arm64-dts-qcom-sm6115-fix-adsp-memory-base-and-length.patch
queue-6.6/arm64-dts-qcom-sm8550-fix-cdsp-memory-length.patch
queue-6.6/arm64-dts-qcom-sm8450-fix-mpss-memory-length.patch
queue-6.6/arm64-dts-qcom-sm6375-fix-mpss-memory-base-and-length.patch
queue-6.6/arm64-dts-qcom-sm8350-fix-adsp-memory-base-and-length.patch
queue-6.6/arm64-dts-qcom-sm6115-fix-cdsp-memory-length.patch




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux