Module Name: src
Committed By: riastradh
Date: Mon Jun 27 00:34:24 UTC 2022
Modified Files:
src/sys/kern: kern_time.c
Log Message:
setitimer(2): Avoid arithmetic overflow in periodic bookkeeping.
Reported-by: [email protected]
To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 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.215 src/sys/kern/kern_time.c:1.216
--- src/sys/kern/kern_time.c:1.215 Sun Jun 26 22:31:58 2022
+++ src/sys/kern/kern_time.c Mon Jun 27 00:34:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.215 2022/06/26 22:31:58 riastradh Exp $ */
+/* $NetBSD: kern_time.c,v 1.216 2022/06/27 00:34:24 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.215 2022/06/26 22:31:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.216 2022/06/27 00:34:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/resourcevar.h>
@@ -851,10 +851,18 @@ itimer_callout(void *arg)
} else {
getnanotime(&now);
}
+
backwards = (timespeccmp(&it->it_time.it_value, &now, >));
- timespecadd(&it->it_time.it_value, &it->it_time.it_interval, &next);
+
+ /* Nonnegative interval guaranteed by itimerfix. */
+ KASSERT(it->it_time.it_interval.tv_sec >= 0);
+ KASSERT(it->it_time.it_interval.tv_nsec >= 0);
+
/* Handle the easy case of non-overflown timers first. */
- if (!backwards && timespeccmp(&next, &now, >)) {
+ if (!backwards &&
+ timespecaddok(&it->it_time.it_value, &it->it_time.it_interval)) {
+ timespecadd(&it->it_time.it_value, &it->it_time.it_interval,
+ &next);
it->it_time.it_value = next;
} else {
now_ns = timespec2ns(&now);
