Commit dad10b6a authored by 蒋家盛's avatar 蒋家盛 Committed by Lei Jitang
Browse files

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

stable inclusion
from stable-v5.10.201
commit 4f861b63945e076f9f003a5fad958174096df1ee
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9RG2R


CVE: CVE-2023-52858

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

[ Upstream commit 2befa515c1bb6cdd33c262b909d93d1973a219aa ]

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

Fixes: 3b5e7486 ("clk: mediatek: add clock support for MT7629 SoC")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20230912093407.21505-5-jiasheng@iscas.ac.cn


Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarLei Jitang <leijitang@huawei.com>
parent 4fcf8eb9

drivers/clk/mediatek/clk-mt7629.c

+6 −0
Original line number Diff line number Diff line
@@ -580,6 +580,8 @@ static int mtk_topckgen_init(struct platform_device *pdev) 
		return PTR_ERR(base);



	clk_data = mtk_alloc_clk_data(CLK_TOP_NR_CLK);

	if (!clk_data)

		return -ENOMEM;



	mtk_clk_register_fixed_clks(top_fixed_clks, ARRAY_SIZE(top_fixed_clks),

				    clk_data);
@@ -603,6 +605,8 @@ static int mtk_infrasys_init(struct platform_device *pdev) 
	struct clk_onecell_data *clk_data;



	clk_data = mtk_alloc_clk_data(CLK_INFRA_NR_CLK);

	if (!clk_data)

		return -ENOMEM;



	mtk_clk_register_gates(node, infra_clks, ARRAY_SIZE(infra_clks),

			       clk_data);
@@ -626,6 +630,8 @@ static int mtk_pericfg_init(struct platform_device *pdev) 
		return PTR_ERR(base);



	clk_data = mtk_alloc_clk_data(CLK_PERI_NR_CLK);

	if (!clk_data)

		return -ENOMEM;



	mtk_clk_register_gates(node, peri_clks, ARRAY_SIZE(peri_clks),

			       clk_data);