diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2021-09-26 01:02:54 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2021-09-26 01:04:13 +0200 |
| commit | 1cc205c510dedb9795103e728e4b8aeee83cbd53 (patch) | |
| tree | fe31a78d0faae5b7ac3ee1722cfaea358acd8860 | |
| parent | 15e6d6785ac2935bb963506b47a37b3d1f728952 (diff) | |
| download | glibc-1cc205c510dedb9795103e728e4b8aeee83cbd53.zip glibc-1cc205c510dedb9795103e728e4b8aeee83cbd53.tar.gz glibc-1cc205c510dedb9795103e728e4b8aeee83cbd53.tar.bz2 | |
htl: make pthread_sigstate read/write set/oset outside sigstate section
so that if a segfault occurs, the handler can run fine.
| -rw-r--r-- | sysdeps/mach/hurd/htl/pt-sigstate.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sysdeps/mach/hurd/htl/pt-sigstate.c b/sysdeps/mach/hurd/htl/pt-sigstate.c index 85abf81..7bc9fb7 100644 --- a/sysdeps/mach/hurd/htl/pt-sigstate.c +++ b/sysdeps/mach/hurd/htl/pt-sigstate.c @@ -30,30 +30,33 @@ __pthread_sigstate (struct __pthread *thread, int how, { error_t err = 0; struct hurd_sigstate *ss; + sigset_t old, new; sigset_t pending; + if (set != NULL) + new = *set; + ss = _hurd_thread_sigstate (thread->kernel_thread); assert (ss); _hurd_sigstate_lock (ss); - if (oset != NULL) - *oset = ss->blocked; + old = ss->blocked; if (set != NULL) { switch (how) { case SIG_BLOCK: - ss->blocked |= *set; + ss->blocked |= new; break; case SIG_SETMASK: - ss->blocked = *set; + ss->blocked = new; break; case SIG_UNBLOCK: - ss->blocked &= ~*set; + ss->blocked &= ~new; break; default: @@ -69,6 +72,9 @@ __pthread_sigstate (struct __pthread *thread, int how, pending = _hurd_sigstate_pending (ss) & ~ss->blocked; _hurd_sigstate_unlock (ss); + if (!err && oset != NULL) + *oset = old; + if (!err && pending) /* Send a message to the signal thread so it will wake up and check for pending signals. */ |