From: David Xu <davidxu@dragonflybsd.org>
Date: Mon, 21 Feb 2005 01:36:05 +0000 (+0000)
Subject: Fix timeout verification bug. Matt Dillon asked to check tv_sec,
X-Git-Tag: v2.0.1~8630
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/f8c41806ffdf68a17c4882d17c8ef2aab496a3c4

Fix timeout verification bug. Matt Dillon asked to check tv_sec,
but I wrote wrong code. ;-)
---

diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 7e36567892..b8f2df96a0 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -37,7 +37,7 @@
  *
  *	@(#)kern_sig.c	8.7 (Berkeley) 4/18/94
  * $FreeBSD: src/sys/kern/kern_sig.c,v 1.72.2.17 2003/05/16 16:34:34 obrien Exp $
- * $DragonFly: src/sys/kern/kern_sig.c,v 1.34 2005/02/20 01:17:44 davidxu Exp $
+ * $DragonFly: src/sys/kern/kern_sig.c,v 1.35 2005/02/21 01:36:05 davidxu Exp $
  */
 
 #include "opt_ktrace.h"
@@ -1036,8 +1036,8 @@ kern_sigtimedwait(sigset_t waitset, siginfo_t *info, struct timespec *timeout)
 	savedmask = p->p_sigmask;
 
 	if (timeout) {
-		if (timeout->tv_sec < 0 || 
-		    (timeout->tv_nsec >= 0 && timeout->tv_nsec < 1000000000)) {
+		if (timeout->tv_sec >= 0 && timeout->tv_nsec >= 0 &&
+		    timeout->tv_nsec < 1000000000) {
 			timevalid = 1;
 			getnanouptime(&rts);
 		 	ets = rts;