[Midnightbsd-cvs] src [8501] trunk/sys/kern: fix a race

[laffer1 at midnightbsd.org]

Revision: 8501
          http://svnweb.midnightbsd.org/src/?rev=8501
Author:   laffer1
Date:     2016-09-18 18:42:18 -0400 (Sun, 18 Sep 2016)
Log Message:
-----------
fix a race

Modified Paths:
--------------
    trunk/sys/kern/init_main.c
    trunk/sys/kern/kern_fork.c
    trunk/sys/kern/kern_time.c

Modified: trunk/sys/kern/init_main.c
===================================================================
--- trunk/sys/kern/init_main.c	2016-09-18 22:42:04 UTC (rev 8500)
+++ trunk/sys/kern/init_main.c	2016-09-18 22:42:18 UTC (rev 8501)
@@ -497,7 +497,7 @@
 	strncpy(p->p_comm, "kernel", sizeof (p->p_comm));
 	strncpy(td->td_name, "swapper", sizeof (td->td_name));
 
-	callout_init(&p->p_itcallout, CALLOUT_MPSAFE);
+	callout_init_mtx(&p->p_itcallout, &p->p_mtx, 0);
 	callout_init_mtx(&p->p_limco, &p->p_mtx, 0);
 	callout_init(&td->td_slpcallout, CALLOUT_MPSAFE);
 

Modified: trunk/sys/kern/kern_fork.c
===================================================================
--- trunk/sys/kern/kern_fork.c	2016-09-18 22:42:04 UTC (rev 8500)
+++ trunk/sys/kern/kern_fork.c	2016-09-18 22:42:18 UTC (rev 8501)
@@ -592,7 +592,7 @@
 	LIST_INIT(&p2->p_children);
 	LIST_INIT(&p2->p_orphans);
 
-	callout_init(&p2->p_itcallout, CALLOUT_MPSAFE);
+	callout_init_mtx(&p2->p_itcallout, &p2->p_mtx, 0);
 
 	/*
 	 * If PF_FORK is set, the child process inherits the

Modified: trunk/sys/kern/kern_time.c
===================================================================
--- trunk/sys/kern/kern_time.c	2016-09-18 22:42:04 UTC (rev 8500)
+++ trunk/sys/kern/kern_time.c	2016-09-18 22:42:18 UTC (rev 8501)
@@ -659,13 +659,11 @@
 	struct timeval ctv, ntv;
 
 	p = (struct proc *)arg;
-	PROC_LOCK(p);
 	kern_psignal(p, SIGALRM);
 	if (!timevalisset(&p->p_realtimer.it_interval)) {
 		timevalclear(&p->p_realtimer.it_value);
 		if (p->p_flag & P_WEXIT)
 			wakeup(&p->p_itcallout);
-		PROC_UNLOCK(p);
 		return;
 	}
 	for (;;) {
@@ -677,7 +675,6 @@
 			timevalsub(&ntv, &ctv);
 			callout_reset(&p->p_itcallout, tvtohz(&ntv) - 1,
 			    realitexpire, p);
-			PROC_UNLOCK(p);
 			return;
 		}
 	}