Commit cfa68e0a authored Sep 12, 2023 by Jiasheng Jiang Committed by Greg Kroah-Hartman Nov 20, 2023

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



[ Upstream commit 0884393c63cc9a1772f7121a6645ba7bd76feeb9 ]

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: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20230912093407.21505-4-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>

parent 2705c5b9

drivers/clk/mediatek/clk-mt7629-eth.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,8 @@ static int clk_mt7629_ethsys_init(struct platform_device *pdev)
		int r;

		clk_data = mtk_alloc_clk_data(CLK_ETH_NR_CLK);
		if (!clk_data)
		return -ENOMEM;

		mtk_clk_register_gates(node, eth_clks, CLK_ETH_NR_CLK, clk_data);

		@@ -105,6 +107,8 @@ static int clk_mt7629_sgmiisys_init(struct platform_device *pdev)
		int r;

		clk_data = mtk_alloc_clk_data(CLK_SGMII_NR_CLK);
		if (!clk_data)
		return -ENOMEM;

		mtk_clk_register_gates(node, sgmii_clks[id++], CLK_SGMII_NR_CLK,
		clk_data);