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

!8457 [sync] PR-8416: iio: adc: stm32-adc: harden against NULL pointer deref in stm32_adc_probe() 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/8416 
 
PR sync from: Cai Xinchen <caixinchen1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/D6ZFKMZS5SDTNTS74RWY4QZCVMQUZJNW/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9REBR 
 
Link:https://gitee.com/openeuler/kernel/pulls/8457

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents db89e355 db43cd11

drivers/iio/adc/stm32-adc-core.c

+7 −2
Original line number Diff line number Diff line
@@ -635,6 +635,8 @@ static int stm32_adc_probe(struct platform_device *pdev) 
	struct stm32_adc_priv *priv;

	struct device *dev = &pdev->dev;

	struct device_node *np = pdev->dev.of_node;

	const struct of_device_id *of_id;



	struct resource *res;

	u32 max_rate;

	int ret;
@@ -647,8 +649,11 @@ static int stm32_adc_probe(struct platform_device *pdev) 
		return -ENOMEM;

	platform_set_drvdata(pdev, &priv->common);



	priv->cfg = (const struct stm32_adc_priv_cfg *)

		of_match_device(dev->driver->of_match_table, dev)->data;

	of_id = of_match_device(dev->driver->of_match_table, dev);

	if (!of_id)

		return -ENODEV;



	priv->cfg = (const struct stm32_adc_priv_cfg *)of_id->data;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->common.base = devm_ioremap_resource(&pdev->dev, res);