Commit 060711f5 authored by Alexandre Belloni's avatar Alexandre Belloni

rtc: digicolor: 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
struct before requesting the IRQ.
Acked-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 86836d64
...@@ -192,6 +192,10 @@ static int __init dc_rtc_probe(struct platform_device *pdev) ...@@ -192,6 +192,10 @@ static int __init dc_rtc_probe(struct platform_device *pdev)
if (IS_ERR(rtc->regs)) if (IS_ERR(rtc->regs))
return PTR_ERR(rtc->regs); return PTR_ERR(rtc->regs);
rtc->rtc_dev = devm_rtc_allocate_device(&pdev->dev);
if (IS_ERR(rtc->rtc_dev))
return PTR_ERR(rtc->rtc_dev);
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (irq < 0) if (irq < 0)
return irq; return irq;
...@@ -200,12 +204,10 @@ static int __init dc_rtc_probe(struct platform_device *pdev) ...@@ -200,12 +204,10 @@ static int __init dc_rtc_probe(struct platform_device *pdev)
return ret; return ret;
platform_set_drvdata(pdev, rtc); platform_set_drvdata(pdev, rtc);
rtc->rtc_dev = devm_rtc_device_register(&pdev->dev, pdev->name,
&dc_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc->rtc_dev))
return PTR_ERR(rtc->rtc_dev);
return 0; rtc->rtc_dev->ops = &dc_rtc_ops;
return rtc_register_device(rtc->rtc_dev);
} }
static const struct of_device_id dc_dt_ids[] = { static const struct of_device_id dc_dt_ids[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment