clk: imx: clk-imxrt1050: fix memory leak in imxrt1050_clocks_probe

[ Upstream commit 1b280598ab3bd8a2dc8b96a12530d5b1ee7a8f4a ]

Use devm_of_iomap() instead of of_iomap() to automatically
handle the unused ioremap region. If any error occurs, regions allocated by
kzalloc() will leak, but using devm_kzalloc() instead will automatically
free the memory using devm_kfree().

Also, fix error handling of hws by adding unregister_hws label, which
unregisters remaining hws when iomap failed.

Fixes: 7154b046d8f3 ("clk: imx: Add initial support for i.MXRT1050 clock driver")
Signed-off-by: Kai Ma <kaima@hust.edu.cn>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Acked-by: Jesse Taube <Mr.Bossman075@gmail.com>
Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
Link: https://lore.kernel.org/r/20230418113451.151312-1-kaima@hust.edu.cn
Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/clk/imx/clk-imxrt1050.c b/drivers/clk/imx/clk-imxrt1050.c
index 26108e9..64d8b65 100644 (file)
--- a/drivers/clk/imx/clk-imxrt1050.c
+++ b/drivers/clk/imx/clk-imxrt1050.c
@@ -42,7 +42,7 @@ static int imxrt1050_clocks_probe(struct platform_device *pdev)
        struct device_node *anp;
        int ret;
 
-       clk_hw_data = kzalloc(struct_size(clk_hw_data, hws,
+       clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws,
                                          IMXRT1050_CLK_END), GFP_KERNEL);
        if (WARN_ON(!clk_hw_data))
                return -ENOMEM;
@@ -53,10 +53,12 @@ static int imxrt1050_clocks_probe(struct platform_device *pdev)
        hws[IMXRT1050_CLK_OSC] = imx_obtain_fixed_clk_hw(np, "osc");
 
        anp = of_find_compatible_node(NULL, NULL, "fsl,imxrt-anatop");
-       pll_base = of_iomap(anp, 0);
+       pll_base = devm_of_iomap(dev, anp, 0, NULL);
        of_node_put(anp);
-       if (WARN_ON(!pll_base))
-               return -ENOMEM;
+       if (WARN_ON(IS_ERR(pll_base))) {
+               ret = PTR_ERR(pll_base);
+               goto unregister_hws;
+       }
 
        /* Anatop clocks */
        hws[IMXRT1050_CLK_DUMMY] = imx_clk_hw_fixed("dummy", 0UL);
@@ -104,8 +106,10 @@ static int imxrt1050_clocks_probe(struct platform_device *pdev)
 
        /* CCM clocks */
        ccm_base = devm_platform_ioremap_resource(pdev, 0);
-       if (WARN_ON(IS_ERR(ccm_base)))
-               return PTR_ERR(ccm_base);
+       if (WARN_ON(IS_ERR(ccm_base))) {
+               ret = PTR_ERR(ccm_base);
+               goto unregister_hws;
+       }
 
        hws[IMXRT1050_CLK_ARM_PODF] = imx_clk_hw_divider("arm_podf", "pll1_arm", ccm_base + 0x10, 0, 3);
        hws[IMXRT1050_CLK_PRE_PERIPH_SEL] = imx_clk_hw_mux("pre_periph_sel", ccm_base + 0x18, 18, 2,
@@ -148,8 +152,12 @@ static int imxrt1050_clocks_probe(struct platform_device *pdev)
        ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_hw_data);
        if (ret < 0) {
                dev_err(dev, "Failed to register clks for i.MXRT1050.\n");
-               imx_unregister_hw_clocks(hws, IMXRT1050_CLK_END);
+               goto unregister_hws;
        }
+       return 0;
+
+unregister_hws:
+       imx_unregister_hw_clocks(hws, IMXRT1050_CLK_END);
        return ret;
 }
 static const struct of_device_id imxrt1050_clk_of_match[] = {