]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
clk: mediatek: clk-mt6765: Add check for mtk_alloc_clk_data
authorJiasheng Jiang <jiasheng@iscas.ac.cn>
Tue, 12 Sep 2023 09:34:03 +0000 (17:34 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Nov 2023 10:56:56 +0000 (11:56 +0100)
[ Upstream commit b82681042724924ae3ba0f2f2eeec217fa31e830 ]

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

Fixes: 1aca9939bf72 ("clk: mediatek: Add MT6765 clock support")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20230912093407.21505-1-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-mt6765.c

index 0377e6dd3206a6c8e5feb60a2a6d826f94bb3f41..780f98408c9b750774b379bcc6626b4f658d1ed5 100644 (file)
@@ -740,6 +740,8 @@ static int clk_mt6765_apmixed_probe(struct platform_device *pdev)
        }
 
        clk_data = mtk_alloc_clk_data(CLK_APMIXED_NR_CLK);
+       if (!clk_data)
+               return -ENOMEM;
 
        mtk_clk_register_plls(node, plls, ARRAY_SIZE(plls), clk_data);
 
@@ -775,6 +777,8 @@ static int clk_mt6765_top_probe(struct platform_device *pdev)
        }
 
        clk_data = mtk_alloc_clk_data(CLK_TOP_NR_CLK);
+       if (!clk_data)
+               return -ENOMEM;
 
        mtk_clk_register_fixed_clks(fixed_clks, ARRAY_SIZE(fixed_clks),
                                    clk_data);
@@ -816,6 +820,8 @@ static int clk_mt6765_ifr_probe(struct platform_device *pdev)
        }
 
        clk_data = mtk_alloc_clk_data(CLK_IFR_NR_CLK);
+       if (!clk_data)
+               return -ENOMEM;
 
        mtk_clk_register_gates(&pdev->dev, node, ifr_clks,
                               ARRAY_SIZE(ifr_clks), clk_data);