Unverified Commit 013b47b3 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5000 [sync] PR-4988: ieee802154: ca8210: Fix a potential UAF in ca8210_probe 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/4988 
 
PR sync from: Yu Liao <liaoyu15@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/EBV7H54FF4FWNVQTIFVIUVPG7H2DW2S5/ 
 
https://gitee.com/src-openeuler/kernel/issues/I95ASM 
 
Link:https://gitee.com/openeuler/kernel/pulls/5000

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents fc8947ee f79e930b

drivers/net/ieee802154/ca8210.c

+3 −14
Original line number Diff line number Diff line
@@ -2782,7 +2782,6 @@ static int ca8210_register_ext_clock(struct spi_device *spi) 
	struct device_node *np = spi->dev.of_node;

	struct ca8210_priv *priv = spi_get_drvdata(spi);

	struct ca8210_platform_data *pdata = spi->dev.platform_data;

	int ret = 0;



	if (!np)

		return -EFAULT;
@@ -2799,18 +2798,8 @@ static int ca8210_register_ext_clock(struct spi_device *spi) 
		dev_crit(&spi->dev, "Failed to register external clk\n");

		return PTR_ERR(priv->clk);

	}

	ret = of_clk_add_provider(np, of_clk_src_simple_get, priv->clk);

	if (ret) {

		clk_unregister(priv->clk);

		dev_crit(

			&spi->dev,

			"Failed to register external clock as clock provider\n"

		);

	} else {

		dev_info(&spi->dev, "External clock set as clock provider\n");

	}



	return ret;

	return of_clk_add_provider(np, of_clk_src_simple_get, priv->clk);

}



/**
@@ -2822,8 +2811,8 @@ static void ca8210_unregister_ext_clock(struct spi_device *spi) 
{

	struct ca8210_priv *priv = spi_get_drvdata(spi);



	if (!priv->clk)

		return

	if (IS_ERR_OR_NULL(priv->clk))

		return;



	of_clk_del_provider(spi->dev.of_node);

	clk_unregister(priv->clk);