]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
rtc: check if __rtc_read_time was successful in rtc_timer_do_work()
authorYongliang Gao <leonylgao@tencent.com>
Fri, 11 Oct 2024 04:31:53 +0000 (12:31 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2024 09:59:41 +0000 (10:59 +0100)
[ Upstream commit e8ba8a2bc4f60a1065f23d6a0e7cbea945a0f40d ]

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>
Link: https://lore.kernel.org/r/20241011043153.3788112-1-leonylgao@gmail.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/rtc/interface.c

index ce051f91829f9f0aa4477e3f3d773821aabb3f95..1ab619fb978a40ee24a660319ed45c605f16f5ec 100644 (file)
@@ -914,13 +914,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)