Module Name: src
Committed By: uwe
Date: Thu Mar 3 01:39:17 UTC 2016
Modified Files:
src/sys/kern: kern_time.c
Log Message:
Don't leak garabage from the kernel stack on sleep(0) and equivalents.
Hat tip to perl's ext/POSIX/t/wrappers.t
To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.184 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.183 src/sys/kern/kern_time.c:1.184
--- src/sys/kern/kern_time.c:1.183 Fri Feb 26 17:08:58 2016
+++ src/sys/kern/kern_time.c Thu Mar 3 01:39:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.183 2016/02/26 17:08:58 christos Exp $ */
+/* $NetBSD: kern_time.c,v 1.184 2016/03/03 01:39:17 uwe 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.183 2016/02/26 17:08:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.184 2016/03/03 01:39:17 uwe Exp $");
#include <sys/param.h>
#include <sys/resourcevar.h>
@@ -331,8 +331,14 @@ nanosleep1(struct lwp *l, clockid_t cloc
struct timespec rmtstart;
int error, timo;
- if ((error = ts2timo(clock_id, flags, rqt, &timo, &rmtstart)) != 0)
- return error == ETIMEDOUT ? 0 : error;
+ if ((error = ts2timo(clock_id, flags, rqt, &timo, &rmtstart)) != 0) {
+ if (error == ETIMEDOUT) {
+ error = 0;
+ if (rmt != NULL)
+ rmt->tv_sec = rmt->tv_nsec = 0;
+ }
+ return error;
+ }
/*
* Avoid inadvertently sleeping forever
