Module Name: src
Committed By: riastradh
Date: Sun Mar 13 12:21:28 UTC 2022
Modified Files:
src/sys/kern: kern_time.c
Log Message:
kern: Handle clock winding back in nanosleep1 without overflow.
Reported-by: syzbot+3bdd260582424a611...@syzkaller.appspotmail.com
To generate a diff of this commit:
cvs rdiff -u -r1.212 -r1.213 src/sys/kern/kern_time.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_time.c
diff -u src/sys/kern/kern_time.c:1.212 src/sys/kern/kern_time.c:1.213
--- src/sys/kern/kern_time.c:1.212 Sat Mar 12 16:46:57 2022
+++ src/sys/kern/kern_time.c Sun Mar 13 12:21:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.212 2022/03/12 16:46:57 riastradh Exp $ */
+/* $NetBSD: kern_time.c,v 1.213 2022/03/13 12:21:28 riastradh Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009, 2020
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.212 2022/03/12 16:46:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.213 2022/03/13 12:21:28 riastradh Exp $");
#include <sys/param.h>
#include <sys/resourcevar.h>
@@ -435,8 +435,14 @@ again:
if (flags & TIMER_ABSTIME) {
timespecsub(rqt, &rmtend, t);
} else {
- timespecsub(&rmtend, &rmtstart, t);
- timespecsub(rqt, t, t);
+ if (timespeccmp(&rmtend, &rmtstart, <))
+ timespecclear(t); /* clock wound back */
+ else
+ timespecsub(&rmtend, &rmtstart, t);
+ if (timespeccmp(rqt, t, <))
+ timespecclear(t);
+ else
+ timespecsub(rqt, t, t);
}
if (t->tv_sec < 0)
timespecclear(t);
