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

[Stephen Borrill]

Module Name:    src
Committed By:   sborrill
Date:           Fri Nov 18 23:17:53 UTC 2011

Modified Files:
        src/sys/kern [netbsd-5]: kern_event.c

Log Message:
Pull up the following revisions(s) (requested by christos in ticket #1693):
        sys/kern/kern_event.c:  revision 1.73

PR/45618: Motoyuki OHMORI: kqueue EVFILT_TIMER with smaller timeout value
makes DIAGNOSTIC kernel panic. If the computed ticks are <= 0 set it to 1.


To generate a diff of this commit:
cvs rdiff -u -r1.60.6.2 -r1.60.6.3 src/sys/kern/kern_event.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_event.c
diff -u src/sys/kern/kern_event.c:1.60.6.2 src/sys/kern/kern_event.c:1.60.6.3
--- src/sys/kern/kern_event.c:1.60.6.2	Sat Jan  9 01:08:39 2010
+++ src/sys/kern/kern_event.c	Fri Nov 18 23:17:53 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_event.c,v 1.60.6.2 2010/01/09 01:08:39 snj Exp $	*/
+/*	$NetBSD: kern_event.c,v 1.60.6.3 2011/11/18 23:17:53 sborrill Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.60.6.2 2010/01/09 01:08:39 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.60.6.3 2011/11/18 23:17:53 sborrill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -571,6 +571,8 @@ filt_timerexpire(void *knx)
 	knote_activate(kn);
 	if ((kn->kn_flags & EV_ONESHOT) == 0) {
 		tticks = mstohz(kn->kn_sdata);
+		if (tticks <= 0)
+			tticks = 1;
 		callout_schedule((callout_t *)kn->kn_hook, tticks);
 	}
 	mutex_exit(&kqueue_misc_lock);