Commit 606f6366 authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Stephen Boyd
Browse files

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



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

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


Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 1f57f78f

drivers/clk/mediatek/clk-mt6797.c

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