svn commit: r275206 - head/sys/kern

[Konstantin Belousov]

Author: kib
Date: Fri Nov 28 10:20:00 2014
New Revision: 275206
URL: https://svnweb.freebsd.org/changeset/base/275206

Log:
  Assert the state of the process lock and sigact mutex in
  kern_sigprocmask() and reschedule_signals().
  
  Discussed with:	rea
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Modified:
  head/sys/kern/kern_sig.c

Modified: head/sys/kern/kern_sig.c
==============================================================================
--- head/sys/kern/kern_sig.c	Fri Nov 28 09:32:07 2014	(r275205)
+++ head/sys/kern/kern_sig.c	Fri Nov 28 10:20:00 2014	(r275206)
@@ -998,8 +998,12 @@ kern_sigprocmask(struct thread *td, int 
 	int error;
 
 	p = td->td_proc;
-	if (!(flags & SIGPROCMASK_PROC_LOCKED))
+	if ((flags & SIGPROCMASK_PROC_LOCKED) != 0)
+		PROC_LOCK_ASSERT(p, MA_OWNED);
+	else
 		PROC_LOCK(p);
+	mtx_assert(&p->p_sigacts->ps_mtx, (flags & SIGPROCMASK_PS_LOCKED) != 0
+	    ? MA_OWNED : MA_NOTOWNED);
 	if (oset != NULL)
 		*oset = td->td_sigmask;
 
@@ -2510,9 +2514,11 @@ reschedule_signals(struct proc *p, sigse
 	int sig;
 
 	PROC_LOCK_ASSERT(p, MA_OWNED);
+	ps = p->p_sigacts;
+	mtx_assert(&ps->ps_mtx, (flags & SIGPROCMASK_PS_LOCKED) != 0 ?
+	    MA_OWNED : MA_NOTOWNED);
 	if (SIGISEMPTY(p->p_siglist))
 		return;
-	ps = p->p_sigacts;
 	SIGSETAND(block, p->p_siglist);
 	while ((sig = sig_ffs(&block)) != 0) {
 		SIGDELSET(block, sig);