Author: kib
Date: Fri Dec 5 09:30:07 2014
New Revision: 275502
URL: https://svnweb.freebsd.org/changeset/base/275502
Log:
MFC r275206:
Assert the state of the process lock and sigact mutex in
kern_sigprocmask() and reschedule_signals().
Modified:
stable/10/sys/kern/kern_sig.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/kern/kern_sig.c
==============================================================================
--- stable/10/sys/kern/kern_sig.c Fri Dec 5 08:46:15 2014
(r275501)
+++ stable/10/sys/kern/kern_sig.c Fri Dec 5 09:30:07 2014
(r275502)
@@ -1003,8 +1003,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;
@@ -2519,9 +2523,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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
