Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1461f0c authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman
Browse files

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



[ 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: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20230901024658.23405-1-jiasheng@iscas.ac.cn


Reviewed-by: default avatarMarkus Schneider-Pargmann <msp@baylibre.com>
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>
parent e8ae4b49

drivers/clk/mediatek/clk-mt2701.c

+8 −0
Original line number Diff line number Diff line
@@ -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);