Commit af35355e authored Jun 12, 2024 by 蒋家盛 Committed by Zhang Zekun Jun 12, 2024

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

stable inclusion
from stable-v4.19.299
commit 1953e62366da5460dc712e045f94fb0d8918999d
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9RFJQ
CVE: CVE-2023-52875

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



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

[ Upstream commit 0d6e24b422a2166a9297a8286ff2e6ab9a5e8cd3 ]

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

Fixes: e9862118 ("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>
Signed-off-by: Zhang Zekun <zhangzekun11@huawei.com>

parent f5fda1e9

drivers/clk/mediatek/clk-mt2701.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -688,6 +688,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);
		@@ -755,6 +757,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);
		@@ -781,6 +785,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))
		@@ -909,6 +915,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);