The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=7556b55f0d67b7fc353ca509dee120dac18fc061
commit 7556b55f0d67b7fc353ca509dee120dac18fc061
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2025-08-05 16:15:16 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2025-08-06 21:24:36 +0000
time: Handle kern_clock_gettime() failures in kern_clock_nanosleep()
kern_clock_gettime(CLOCK_TAI) can fail with EINVAL.
Reported by: syzbot+e17e46b1f0b65027b...@syzkaller.appspotmail.com
Reviewed by: imp, kib
Fixes: 7b7ba7857ce8 ("Implement CLOCK_TAI")
Differential Revision: https://reviews.freebsd.org/D51744
---
sys/kern/kern_time.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 9830e5093a3a..2a6f0989f6aa 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -571,7 +571,10 @@ kern_clock_nanosleep(struct thread *td, clockid_t
clock_id, int flags,
td->td_rtcgen =
atomic_load_acq_int(&rtc_generation);
error = kern_clock_gettime(td, clock_id, &now);
- KASSERT(error == 0, ("kern_clock_gettime: %d", error));
+ if (error != 0) {
+ td->td_rtcgen = 0;
+ return (error);
+ }
timespecsub(&ts, &now, &ts);
}
if (ts.tv_sec < 0 || (ts.tv_sec == 0 && ts.tv_nsec == 0)) {
