]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
soc: mediatek: mtk-devapc: Fix leaking IO map on error paths
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Sat, 4 Jan 2025 14:20:11 +0000 (15:20 +0100)
committerAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tue, 7 Jan 2025 12:13:57 +0000 (13:13 +0100)
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 <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20250104142012.115974-1-krzysztof.kozlowski@linaro.org
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
drivers/soc/mediatek/mtk-devapc.c

index 2a1adcb87d4e4b812710361919cd0770294aaedd..500847b41b1603fe9eb40e9347b9afc4b716476b 100644 (file)
@@ -273,23 +273,31 @@ static int mtk_devapc_probe(struct platform_device *pdev)
                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 void mtk_devapc_remove(struct platform_device *pdev)