d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug in r358168, do not call sigfastblock_setpend() under a mutex.

Browse Source 
PR:	244250
Reported and tested by:	lwhsu
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Konstantin Belousov 2020-02-20 21:25:12 +00:00
parent 9a990500e5
commit 74cb9a5333
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/subr_trap.c
View File

@ -326,21 +326,23 @@ ast(struct trapframe *framep)
if (flags & TDF_NEEDSIGCHK || p->p_pendingcnt > 0 || if (flags & TDF_NEEDSIGCHK || p->p_pendingcnt > 0 ||
!SIGISEMPTY(p->p_siglist)) { !SIGISEMPTY(p->p_siglist)) {
sigfastblock_fetch(td); sigfastblock_fetch(td);
PROC_LOCK(p);
mtx_lock(&p->p_sigacts->ps_mtx);
if ((td->td_pflags & TDP_SIGFASTBLOCK) != 0 && if ((td->td_pflags & TDP_SIGFASTBLOCK) != 0 &&
td->td_sigblock_val != 0) { td->td_sigblock_val != 0) {
sigfastblock_setpend(td); sigfastblock_setpend(td);
PROC_LOCK(p);
reschedule_signals(p, fastblock_mask, reschedule_signals(p, fastblock_mask,
SIGPROCMASK_PS_LOCKED | SIGPROCMASK_FASTBLK); SIGPROCMASK_FASTBLK);
PROC_UNLOCK(p);
} else { } else {
PROC_LOCK(p);
mtx_lock(&p->p_sigacts->ps_mtx);
while ((sig = cursig(td)) != 0) { while ((sig = cursig(td)) != 0) {
KASSERT(sig >= 0, ("sig %d", sig)); KASSERT(sig >= 0, ("sig %d", sig));
postsig(sig); postsig(sig);
} }
mtx_unlock(&p->p_sigacts->ps_mtx);
PROC_UNLOCK(p);
} }
mtx_unlock(&p->p_sigacts->ps_mtx);
PROC_UNLOCK(p);
} }
/* /*