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

MFC r258499:

Browse Source 
Fix for the spurious signal handler call with zero signo in the threaded
process.

Approved by:	re (hrs)
This commit is contained in:
kib 2013-11-30 14:36:32 +00:00
parent 5a0de0a477
commit be650673e4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libthr/thread/thr_private.h
View File

@ -433,6 +433,9 @@ struct pthread {
/* the sigaction should be used for deferred signal. */
struct sigaction deferred_sigact;
/* deferred signal delivery is performed, do not reenter. */
int deferred_run;
/* Force new thread to exit. */
int force_exit;

9
lib/libthr/thread/thr_sig.c
View File

@ -162,6 +162,7 @@ thr_sighandler(int sig, siginfo_t *info, void *_ucp)
act = _thr_sigact[sig-1].sigact;
_thr_rwl_unlock(&_thr_sigact[sig-1].lock);
errno = err;
curthread->deferred_run = 0;
/*
* if a thread is in critical region, for example it holds low level locks,
@ -320,14 +321,18 @@ check_deferred_signal(struct pthread *curthread)
siginfo_t info;
int uc_len;
if (__predict_true(curthread->deferred_siginfo.si_signo == 0))
if (__predict_true(curthread->deferred_siginfo.si_signo == 0 ||
curthread->deferred_run))
return;
curthread->deferred_run = 1;
uc_len = __getcontextx_size();
uc = alloca(uc_len);
getcontext(uc);
if (curthread->deferred_siginfo.si_signo == 0)
if (curthread->deferred_siginfo.si_signo == 0) {
curthread->deferred_run = 0;
return;
}
__fillcontextx2((char *)uc);
act = curthread->deferred_sigact;
uc->uc_sigmask = curthread->deferred_sigmask;