hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwmon: (axi-fan-control) Fix possible NULL pointer dereference

Browse Source 
[ Upstream commit 2a5b3370a1d9750eca325292e291c8c7cb8cf2e0 ]

axi_fan_control_irq_handler(), dependent on the private
axi_fan_control_data structure, might be called before the hwmon
device is registered. That will cause an "Unable to handle kernel
NULL pointer dereference" error.

Fixes: 8412b410fa ("hwmon: Support ADI Fan Control IP")
Signed-off-by: Dragos Bogdan <dragos.bogdan@analog.com>
Signed-off-by: Nuno Sa <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20231025132100.649499-1-nuno.sa@analog.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dragos Bogdan 2023-10-25 15:21:00 +02:00 committed by Greg Kroah-Hartman
parent 44a96796d2
commit 33de53a270
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/hwmon/axi-fan-control.c
View File

@ -496,6 +496,21 @@ static int axi_fan_control_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
ret = axi_fan_control_init(ctl, pdev->dev.of_node);
if (ret) {
dev_err(&pdev->dev, "Failed to initialize device\n");
return ret;
}
ctl->hdev = devm_hwmon_device_register_with_info(&pdev->dev,
name,
ctl,
&axi_chip_info,
axi_fan_control_groups);
if (IS_ERR(ctl->hdev))
return PTR_ERR(ctl->hdev);
ctl->irq = platform_get_irq(pdev, 0); ctl->irq = platform_get_irq(pdev, 0);
if (ctl->irq < 0) if (ctl->irq < 0)
return ctl->irq; return ctl->irq;
@ -509,19 +524,7 @@ static int axi_fan_control_probe(struct platform_device *pdev)
return ret; return ret;
} }
ret = axi_fan_control_init(ctl, pdev->dev.of_node); return 0;
if (ret) {
dev_err(&pdev->dev, "Failed to initialize device\n");
return ret;
}
ctl->hdev = devm_hwmon_device_register_with_info(&pdev->dev,
name,
ctl,
&axi_chip_info,
axi_fan_control_groups);
return PTR_ERR_OR_ZERO(ctl->hdev);
} }
static struct platform_driver axi_fan_control_driver = { static struct platform_driver axi_fan_control_driver = {