rtc: check if __rtc_read_time was successful in rtc_timer_do_work()

[PATCH] rtc: check if __rtc_read_time was successful in rtc_timer_do_work()

Posted by Yongliang Gao 1 year, 3 months ago

From: Yongliang Gao <leonylgao@tencent.com>

If the __rtc_read_time call fails,, the struct rtc_time tm; may contain
uninitialized data, or an illegal date/time read from the RTC hardware.

When calling rtc_tm_to_ktime later, the result may be a very large value
(possibly KTIME_MAX). If there are periodic timers in rtc->timerqueue,
they will continually expire, may causing kernel softlockup.

Fixes: 6610e0893b8b ("RTC: Rework RTC code to use timerqueue for events")
Signed-off-by: Yongliang Gao <leonylgao@tencent.com>
Acked-by: Jingqun Li <jingqunli@tencent.com>
---
 drivers/rtc/interface.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index cca650b2e0b9..aaf76406cd7d 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -904,13 +904,18 @@ void rtc_timer_do_work(struct work_struct *work)
 	struct timerqueue_node *next;
 	ktime_t now;
 	struct rtc_time tm;
+	int err;
 
 	struct rtc_device *rtc =
 		container_of(work, struct rtc_device, irqwork);
 
 	mutex_lock(&rtc->ops_lock);
 again:
-	__rtc_read_time(rtc, &tm);
+	err = __rtc_read_time(rtc, &tm);
+	if (err) {
+		mutex_unlock(&rtc->ops_lock);
+		return;
+	}
 	now = rtc_tm_to_ktime(tm);
 	while ((next = timerqueue_getnext(&rtc->timerqueue))) {
 		if (next->expires > now)
-- 
2.39.3

Re: [PATCH] rtc: check if __rtc_read_time was successful in rtc_timer_do_work()

Posted by Alexandre Belloni 1 year, 2 months ago

On Fri, 11 Oct 2024 12:31:53 +0800, Yongliang Gao wrote:
> If the __rtc_read_time call fails,, the struct rtc_time tm; may contain
> uninitialized data, or an illegal date/time read from the RTC hardware.
> 
> When calling rtc_tm_to_ktime later, the result may be a very large value
> (possibly KTIME_MAX). If there are periodic timers in rtc->timerqueue,
> they will continually expire, may causing kernel softlockup.
> 
> [...]

Applied, thanks!

[1/1] rtc: check if __rtc_read_time was successful in rtc_timer_do_work()
      https://git.kernel.org/abelloni/c/e8ba8a2bc4f6

Best regards,

-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [PATCH] rtc: check if __rtc_read_time was successful in rtc_timer_do_work()

Posted by Yongliang Gao 1 year, 2 months ago

Hi Alexandre Belloni,

I've noticed that the post-failure process for __rtc_read_time
requires careful handling.
1. Need to call pm_relax.
2. Potentially need to set the alarm to ensure subsequent interrupts
can process the
    expired timer? Could you give me some advice?
Should I continue to submit a fix patch or create a v2 version of the patch?

Best Regards,
Yongliang Gao

On Tue, Nov 12, 2024 at 6:11 AM Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
>
> On Fri, 11 Oct 2024 12:31:53 +0800, Yongliang Gao wrote:
> > If the __rtc_read_time call fails,, the struct rtc_time tm; may contain
> > uninitialized data, or an illegal date/time read from the RTC hardware.
> >
> > When calling rtc_tm_to_ktime later, the result may be a very large value
> > (possibly KTIME_MAX). If there are periodic timers in rtc->timerqueue,
> > they will continually expire, may causing kernel softlockup.
> >
> > [...]
>
> Applied, thanks!
>
> [1/1] rtc: check if __rtc_read_time was successful in rtc_timer_do_work()
>       https://git.kernel.org/abelloni/c/e8ba8a2bc4f6
>
> Best regards,
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com