diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2023-01-10 13:45:28 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2023-01-10 13:48:02 +0300 |
| commit | 7c14e5a10add3ad3dc53ed6af1ad2044d205e844 (patch) | |
| tree | b214f9a6c2ed3953bdb796d7a48d014e061b8532 /winsup | |
| parent | 1a9f95d8941d58385fb76ec20fac143c035cec85 (diff) | |
Cygwin: /proc/<PID>/status: avoid crash computing signal info
The code computing the mask of pending signals used the per-queued
signal TLS pointer without checking it for NULL. Fix this by using
the process-wide signal mask in that case.
Fixes: 195169186bfd5 ("Cygwin: wait_sig: allow to compute process-wide mask of pending signals")
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/release/3.4.4 | 3 | ||||
| -rw-r--r-- | winsup/cygwin/sigproc.cc | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/winsup/cygwin/release/3.4.4 b/winsup/cygwin/release/3.4.4 index a653b08a1..35d746ba0 100644 --- a/winsup/cygwin/release/3.4.4 +++ b/winsup/cygwin/release/3.4.4 @@ -10,3 +10,6 @@ Bug Fixes - Reinstantiate exporting _alloca. Addresses: https://cygwin.com/pipermail/cygwin/2023-January/252797.html + +- Avoid hangs when reading /proc/<PID>/status. + Addresses: https://cygwin.com/pipermail/cygwin/2022-December/252756.html diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc index ce36c8be3..86e4e607a 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -1375,7 +1375,8 @@ wait_sig (VOID *) *pack.mask = 0; while ((q = q->next)) { - if (q->sigtls->sigmask & (bit = SIGTOMASK (q->si.si_signo))) + _cygtls *sigtls = q->sigtls ?: _main_tls; + if (sigtls->sigmask & (bit = SIGTOMASK (q->si.si_signo))) { tl_entry = cygheap->find_tls (q->si.si_signo, issig_wait); if (tl_entry) |