Commit c5723105 authored May 27, 2024 by 蒋家盛 Committed by Zheng Zucheng May 27, 2024

clk: mediatek: clk-mt6765: Add check for mtk_alloc_clk_data

stable inclusion
from stable-v5.10.201
commit 2617aa8ceaf30e41d3eb7f5fef3445542bef193a
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9RG0H
CVE: CVE-2023-52870

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2617aa8ceaf30e41d3eb7f5fef3445542bef193a



--------------------------------

[ Upstream commit b82681042724924ae3ba0f2f2eeec217fa31e830 ]

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

Fixes: 1aca9939 ("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>
Signed-off-by: sanglipeng <sanglipeng1@jd.com>
Signed-off-by: Zheng Zucheng <zhengzucheng@huawei.com>

parent a2d508a1

drivers/clk/mediatek/clk-mt6765.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -785,6 +785,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);

		@@ -820,6 +822,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);
		@@ -860,6 +864,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(node, ifr_clks, ARRAY_SIZE(ifr_clks),
		clk_data);