diff options
| author | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2018-05-17 22:18:58 +0200 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2018-05-17 22:23:18 +0200 |
| commit | 661eb89a11c5f39249d8d0d50b4e538ef7bdd9d6 (patch) | |
| tree | 9c759dbfa77c1ddfdd7952cd1722ee7c62813a40 | |
| parent | ba78d51bdf97e67d6ae37075fa34c75068c2938e (diff) | |
| download | linux-661eb89a11c5f39249d8d0d50b4e538ef7bdd9d6.tar.bz2 | |
rtc: 88pm80x: fix possible race condition
The IRQ is requested before the struct rtc is allocated and registered, but
this struct is used in the IRQ handler. This may lead to a NULL pointer
dereference.
Switch to devm_rtc_allocate_device/rtc_register_device to allocate the rtc
before requesting the IRQ.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
| -rw-r--r-- | drivers/rtc/rtc-88pm80x.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-88pm80x.c b/drivers/rtc/rtc-88pm80x.c index f60c0d73c2f3..dae527f8c58e 100644 --- a/drivers/rtc/rtc-88pm80x.c +++ b/drivers/rtc/rtc-88pm80x.c @@ -290,6 +290,10 @@ static int pm80x_rtc_probe(struct platform_device *pdev) info->dev = &pdev->dev; dev_set_drvdata(&pdev->dev, info); + info->rtc_dev = devm_rtc_allocate_device(&pdev->dev); + if (IS_ERR(info->rtc_dev)) + return PTR_ERR(info->rtc_dev); + ret = pm80x_request_irq(chip, info->irq, rtc_update_handler, IRQF_ONESHOT, "rtc", info); if (ret < 0) { @@ -298,10 +302,10 @@ static int pm80x_rtc_probe(struct platform_device *pdev) goto out; } - info->rtc_dev = devm_rtc_device_register(&pdev->dev, "88pm80x-rtc", - &pm80x_rtc_ops, THIS_MODULE); - if (IS_ERR(info->rtc_dev)) { - ret = PTR_ERR(info->rtc_dev); + info->rtc_dev->ops = &pm80x_rtc_ops; + + ret = rtc_register_device(info->rtc_dev); + if (ret) { dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret); goto out_rtc; } |