rtc: zynqmp: fix possible race condition
Subsystems (2)
Alexandre Belloni
maintainerPATCH 1/2 rtc: zynqmp: 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.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-zynqmp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/rtc/rtc-zynqmp.c +7 -3
@@ -222,6 +222,12 @@ static int xlnx_rtc_probe(struct platform_device *pdev)platform_set_drvdata (pdev, xrtcdev); + xrtcdev->rtc =devm_rtc_allocate_device (&pdev->dev); +if (IS_ERR (xrtcdev->rtc)) +return PTR_ERR (xrtcdev->rtc); + + xrtcdev->rtc->ops = &xlnx_rtc_ops; + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); xrtcdev->reg_base =devm_ioremap_resource (&pdev->dev, res);
@@ -263,9 +269,7 @@ static int xlnx_rtc_probe(struct platform_device *pdev)device_init_wakeup (&pdev->dev,1 ); - xrtcdev->rtc =devm_rtc_device_register (&pdev->dev, pdev->name, - &xlnx_rtc_ops,THIS_MODULE ); -return PTR_ERR_OR_ZERO (xrtcdev->rtc); +return rtc_register_device (xrtcdev->rtc); }static int xlnx_rtc_remove (struct platform_device *pdev)
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 2/2 rtc: zynqmp: let the core handle range
Let the core handle the RTC range instead of open coding it.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-zynqmp.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/rtc/rtc-zynqmp.c +1 -7
@@ -49,7 +49,6 @@#define RTC_CALIB_DEF 0x198233#define RTC_CALIB_MASK 0x1FFFFF -#define RTC_SEC_MAX_VAL 0xFFFFFFFFstruct xlnx_rtc_dev {struct rtc_device *rtc;
@@ -71,9 +70,6 @@ static int xlnx_rtc_set_time(struct device *dev, struct rtc_time *tm)*/ new_time =rtc_tm_to_time64 (tm) +1 ; -if (new_time >RTC_SEC_MAX_VAL ) -return -EINVAL ; -/* * Writing into calibration register will clear the Tick Counter and * force the next second to be signaled exactly in 1 second period
@@ -154,9 +150,6 @@ static int xlnx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) alarm_time =rtc_tm_to_time64 (&alrm->time); -if (alarm_time >RTC_SEC_MAX_VAL ) -return -EINVAL ; -writel ((u32 )alarm_time, (xrtcdev->reg_base +RTC_ALRM ));xlnx_rtc_alarm_irq_enable (dev, alrm->enabled);
@@ -227,6 +220,7 @@ static int xlnx_rtc_probe(struct platform_device *pdev)return PTR_ERR (xrtcdev->rtc); xrtcdev->rtc->ops = &xlnx_rtc_ops; + xrtcdev->rtc->range_max =U32_MAX ; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
Signature · 1 line
2.20.1