CVS commit: [netbsd-9] src/sys/kern

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Mon May 18 19:05:32 UTC 2020

Modified Files:
        src/sys/kern [netbsd-9]: kern_time.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #916):

        sys/kern/kern_time.c: revision 1.204

Fix uninitialized memory access. Found by KMSAN.


To generate a diff of this commit:
cvs rdiff -u -r1.197.4.2 -r1.197.4.3 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.197.4.2 src/sys/kern/kern_time.c:1.197.4.3
--- src/sys/kern/kern_time.c:1.197.4.2	Wed Sep 11 16:36:13 2019
+++ src/sys/kern/kern_time.c	Mon May 18 19:05:32 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_time.c,v 1.197.4.2 2019/09/11 16:36:13 martin Exp $	*/
+/*	$NetBSD: kern_time.c,v 1.197.4.3 2020/05/18 19:05:32 martin 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.197.4.2 2019/09/11 16:36:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.197.4.3 2020/05/18 19:05:32 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/resourcevar.h>
@@ -356,8 +356,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);