Module Name: src
Committed By: maxv
Date: Thu May 14 18:18:24 UTC 2020
Modified Files:
src/sys/kern: kern_time.c
Log Message:
Fix uninitialized memory access. Found by KMSAN.
Reported-by: [email protected]
To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 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.203 src/sys/kern/kern_time.c:1.204
--- src/sys/kern/kern_time.c:1.203 Thu Jan 2 15:42:27 2020
+++ src/sys/kern/kern_time.c Thu May 14 18:18:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.203 2020/01/02 15:42:27 thorpej Exp $ */
+/* $NetBSD: kern_time.c,v 1.204 2020/05/14 18:18:24 maxv Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.203 2020/01/02 15:42:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.204 2020/05/14 18:18:24 maxv Exp $");
#include <sys/param.h>
#include <sys/resourcevar.h>
@@ -352,8 +352,12 @@ again:
struct timespec rmtend;
struct timespec t0;
struct timespec *t;
+ int err;
+
+ err = clock_gettime1(clock_id, &rmtend);
+ if (err != 0)
+ return err;
- (void)clock_gettime1(clock_id, &rmtend);
t = (rmt != NULL) ? rmt : &t0;
if (flags & TIMER_ABSTIME) {
timespecsub(rqt, &rmtend, t);
