]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
clk: mediatek: clk-mt2701: Add check for mtk_alloc_clk_data
authorJiasheng Jiang <jiasheng@iscas.ac.cn>
Fri, 1 Sep 2023 02:46:58 +0000 (10:46 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Nov 2023 10:08:18 +0000 (11:08 +0100)
[ Upstream commit 0d6e24b422a2166a9297a8286ff2e6ab9a5e8cd3 ]

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

Fixes: e9862118272a ("clk: mediatek: Add MT2701 clock support")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20230901024658.23405-1-jiasheng@iscas.ac.cn
Reviewed-by: Markus Schneider-Pargmann <msp@baylibre.com>
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-mt2701.c

index 695be0f77427014af8ac40f78dfd39b952fde68a..c67cd73aca171788f8964e10e05bd6c8c042cfdf 100644 (file)
@@ -675,6 +675,8 @@ static int mtk_topckgen_init(struct platform_device *pdev)
                return PTR_ERR(base);
 
        clk_data = mtk_alloc_clk_data(CLK_TOP_NR);
+       if (!clk_data)
+               return -ENOMEM;
 
        mtk_clk_register_fixed_clks(top_fixed_clks, ARRAY_SIZE(top_fixed_clks),
                                                                clk_data);
@@ -742,6 +744,8 @@ static void __init mtk_infrasys_init_early(struct device_node *node)
 
        if (!infra_clk_data) {
                infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR);
+               if (!infra_clk_data)
+                       return;
 
                for (i = 0; i < CLK_INFRA_NR; i++)
                        infra_clk_data->clks[i] = ERR_PTR(-EPROBE_DEFER);
@@ -768,6 +772,8 @@ static int mtk_infrasys_init(struct platform_device *pdev)
 
        if (!infra_clk_data) {
                infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR);
+               if (!infra_clk_data)
+                       return -ENOMEM;
        } else {
                for (i = 0; i < CLK_INFRA_NR; i++) {
                        if (infra_clk_data->clks[i] == ERR_PTR(-EPROBE_DEFER))
@@ -896,6 +902,8 @@ static int mtk_pericfg_init(struct platform_device *pdev)
                return PTR_ERR(base);
 
        clk_data = mtk_alloc_clk_data(CLK_PERI_NR);
+       if (!clk_data)
+               return -ENOMEM;
 
        mtk_clk_register_gates(node, peri_clks, ARRAY_SIZE(peri_clks),
                                                clk_data);