Commit 82663f99 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Greg Kroah-Hartman

rtc: pl030: fix possible race condition

[ Upstream commit c778ec85 ]

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: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5a869e98
...@@ -112,6 +112,13 @@ static int pl030_probe(struct amba_device *dev, const struct amba_id *id) ...@@ -112,6 +112,13 @@ static int pl030_probe(struct amba_device *dev, const struct amba_id *id)
goto err_rtc; goto err_rtc;
} }
rtc->rtc = devm_rtc_allocate_device(&dev->dev);
if (IS_ERR(rtc->rtc)) {
ret = PTR_ERR(rtc->rtc);
goto err_rtc;
}
rtc->rtc->ops = &pl030_ops;
rtc->base = ioremap(dev->res.start, resource_size(&dev->res)); rtc->base = ioremap(dev->res.start, resource_size(&dev->res));
if (!rtc->base) { if (!rtc->base) {
ret = -ENOMEM; ret = -ENOMEM;
...@@ -128,12 +135,9 @@ static int pl030_probe(struct amba_device *dev, const struct amba_id *id) ...@@ -128,12 +135,9 @@ static int pl030_probe(struct amba_device *dev, const struct amba_id *id)
if (ret) if (ret)
goto err_irq; goto err_irq;
rtc->rtc = rtc_device_register("pl030", &dev->dev, &pl030_ops, ret = rtc_register_device(rtc->rtc);
THIS_MODULE); if (ret)
if (IS_ERR(rtc->rtc)) {
ret = PTR_ERR(rtc->rtc);
goto err_reg; goto err_reg;
}
return 0; return 0;
...@@ -154,7 +158,6 @@ static int pl030_remove(struct amba_device *dev) ...@@ -154,7 +158,6 @@ static int pl030_remove(struct amba_device *dev)
writel(0, rtc->base + RTC_CR); writel(0, rtc->base + RTC_CR);
free_irq(dev->irq[0], rtc); free_irq(dev->irq[0], rtc);
rtc_device_unregister(rtc->rtc);
iounmap(rtc->base); iounmap(rtc->base);
amba_release_regions(dev); amba_release_regions(dev);
......
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