Skip to content

Commit

Permalink
rtc: davinci: Initialize drvdata before registering device
Browse files Browse the repository at this point in the history
Commit f44f7f9 ("RTC: Initialize kernel state from RTC") uncovered
an issue in a number of RTC drivers, where the drivers call
rtc_device_register before initializing the device or platform drvdata.

This frequently results in null pointer dereferences when the
rtc_device_register immediately makes use of the rtc device, calling
rtc_read_alarm.

The solution is to ensure the drvdata is initialized prior to registering
the rtc device.

CC: Alessandro Zummo <a.zummo@towertech.it>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: rtc-linux@googlegroups.com
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
[fixed up commit log -jstultz]
Signed-off-by: John Stultz <john.stultz@linaro.org>
  • Loading branch information
Wolfram Sang authored and John Stultz committed May 7, 2011
1 parent 5f54c8a commit f4e708a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/rtc/rtc-davinci.c
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,8 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
goto fail2;
}

platform_set_drvdata(pdev, davinci_rtc);

davinci_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
&davinci_rtc_ops, THIS_MODULE);
if (IS_ERR(davinci_rtc->rtc)) {
Expand Down Expand Up @@ -553,15 +555,14 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)

rtcss_write(davinci_rtc, PRTCSS_RTC_CCTRL_CAEN, PRTCSS_RTC_CCTRL);

platform_set_drvdata(pdev, davinci_rtc);

device_init_wakeup(&pdev->dev, 0);

return 0;

fail4:
rtc_device_unregister(davinci_rtc->rtc);
fail3:
platform_set_drvdata(pdev, NULL);
iounmap(davinci_rtc->base);
fail2:
release_mem_region(davinci_rtc->pbase, davinci_rtc->base_size);
Expand Down

0 comments on commit f4e708a

Please sign in to comment.