clk: mediatek: clk-mt7629: Add check for mtk_alloc_clk_data
authorJiasheng Jiang <jiasheng@iscas.ac.cn>
Tue, 12 Sep 2023 09:34:07 +0000 (17:34 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Nov 2023 10:59:06 +0000 (11:59 +0100)
[ Upstream commit 2befa515c1bb6cdd33c262b909d93d1973a219aa ]

Add the check for the return value of mtk_alloc_clk_data() in order to
avoid NULL pointer dereference.

Fixes: 3b5e748615e7 ("clk: mediatek: add clock support for MT7629 SoC")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20230912093407.21505-5-jiasheng@iscas.ac.cn
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/clk/mediatek/clk-mt7629.c

index 2882107..b8a1f01 100644 (file)
@@ -555,6 +555,8 @@ static int mtk_topckgen_init(struct platform_device *pdev)
                return PTR_ERR(base);
 
        clk_data = mtk_alloc_clk_data(CLK_TOP_NR_CLK);
+       if (!clk_data)
+               return -ENOMEM;
 
        mtk_clk_register_fixed_clks(top_fixed_clks, ARRAY_SIZE(top_fixed_clks),
                                    clk_data);
@@ -579,6 +581,8 @@ static int mtk_infrasys_init(struct platform_device *pdev)
        struct clk_hw_onecell_data *clk_data;
 
        clk_data = mtk_alloc_clk_data(CLK_INFRA_NR_CLK);
+       if (!clk_data)
+               return -ENOMEM;
 
        mtk_clk_register_gates(&pdev->dev, node, infra_clks,
                               ARRAY_SIZE(infra_clks), clk_data);
@@ -602,6 +606,8 @@ static int mtk_pericfg_init(struct platform_device *pdev)
                return PTR_ERR(base);
 
        clk_data = mtk_alloc_clk_data(CLK_PERI_NR_CLK);
+       if (!clk_data)
+               return -ENOMEM;
 
        mtk_clk_register_gates(&pdev->dev, node, peri_clks,
                               ARRAY_SIZE(peri_clks), clk_data);