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

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

Fixes: 96596aa06628 ("clk: mediatek: add clk support for MT6797")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20230912093407.21505-3-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-mt6797.c

index 2ebd25f..f12d4e9 100644 (file)
@@ -390,6 +390,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_factors(top_fixed_divs, ARRAY_SIZE(top_fixed_divs),
                                 clk_data);
@@ -545,6 +547,8 @@ static void 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->hws[i] = ERR_PTR(-EPROBE_DEFER);
@@ -570,6 +574,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->hws[i] == ERR_PTR(-EPROBE_DEFER))