Module Name: src
Committed By: bouyer
Date: Tue May 21 16:25:55 UTC 2013
Modified Files:
src/sys/kern: subr_time.c
Log Message:
ts2timo(): if TIMER_ABSTIME is set and start is not NULL, initialize
it to 0. Some callers (e.g. nanosleep1()) expect *start to always be
initialized and would use random values from stack otherwise.
While there, remove an always-true conditionnal.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/kern/subr_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/subr_time.c
diff -u src/sys/kern/subr_time.c:1.15 src/sys/kern/subr_time.c:1.16
--- src/sys/kern/subr_time.c:1.15 Mon Apr 1 16:37:22 2013
+++ src/sys/kern/subr_time.c Tue May 21 16:25:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_time.c,v 1.15 2013/04/01 16:37:22 christos Exp $ */
+/* $NetBSD: subr_time.c,v 1.16 2013/05/21 16:25:55 bouyer Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.15 2013/04/01 16:37:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.16 2013/05/21 16:25:55 bouyer Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -246,14 +246,15 @@ ts2timo(clockid_t clock_id, int flags, s
int error;
struct timespec tsd;
- flags &= TIMER_ABSTIME;
+ if (flags && start != NULL)
+ memset(start, 0, sizeof(*start));
+ flags &= TIMER_ABSTIME;
if (start == NULL || flags)
start = &tsd;
- if (start)
- if ((error = clock_gettime1(clock_id, start)) != 0)
- return error;
+ if ((error = clock_gettime1(clock_id, start)) != 0)
+ return error;
if (flags)
timespecsub(ts, start, ts);
