Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern Don't leak garabage from the kernel stack on sleep(...



details:   https://anonhg.NetBSD.org/src/rev/fef3705ad87f
branches:  trunk
changeset: 814058:fef3705ad87f
user:      uwe <uwe%NetBSD.org@localhost>
date:      Thu Mar 03 01:39:17 2016 +0000

description:
Don't leak garabage from the kernel stack on sleep(0) and equivalents.
Hat tip to perl's ext/POSIX/t/wrappers.t

diffstat:

 sys/kern/kern_time.c |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 2953be8d9232 -r fef3705ad87f sys/kern/kern_time.c
--- a/sys/kern/kern_time.c      Wed Mar 02 19:28:56 2016 +0000
+++ b/sys/kern/kern_time.c      Thu Mar 03 01:39:17 2016 +0000
@@ -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 @@
        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



Home | Main Index | Thread Index | Old Index