diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2022-05-03 16:16:18 +0300 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2022-05-03 16:16:18 +0300 |
commit | 5a6de512ab5d46f7a0f019e7345e800a0a274a62 (patch) | |
tree | 5a51a03bdeda43355f606b4f1e3032cbee09d0e7 | |
parent | 28970dae34522059e094eb7db466404facb09460 (diff) |
Cygwin: always add sigmask to child info
Even after fork, we might need the parent sigmask without having
access to the real _main_tls. There's a short time at process startup,
when _main_tls points to the system-allocated stack, but wait_sig is
already running. If we can't lock _main_tls, because find_tls can't
find it yet, we now access the parent's sigmask via child_info.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
-rw-r--r-- | winsup/cygwin/child_info.h | 5 | ||||
-rw-r--r-- | winsup/cygwin/dcrt0.cc | 2 | ||||
-rw-r--r-- | winsup/cygwin/sigproc.cc | 18 |
3 files changed, 18 insertions, 7 deletions
diff --git a/winsup/cygwin/child_info.h b/winsup/cygwin/child_info.h index 7a67a1b51..181db8fa2 100644 --- a/winsup/cygwin/child_info.h +++ b/winsup/cygwin/child_info.h @@ -37,7 +37,7 @@ enum child_status #define EXEC_MAGIC_SIZE sizeof(child_info) /* Change this value if you get a message indicating that it is out-of-sync. */ -#define CURR_CHILD_INFO_MAGIC 0xecc930b9U +#define CURR_CHILD_INFO_MAGIC 0xacbf4682U #include "pinfo.h" struct cchildren @@ -71,6 +71,8 @@ public: unsigned fhandler_union_cb; DWORD exit_code; // process exit code static int retry_count;// retry count; + sigset_t sigmask; + child_info (unsigned, child_info_types, bool); child_info (): subproc_ready (NULL), parent (NULL) {} ~child_info (); @@ -130,7 +132,6 @@ public: int envc; char **envp; HANDLE myself_pinfo; - sigset_t sigmask; int nchildren; cchildren children[0]; static cygheap_exec_info *alloc (); diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index dee8482c2..8869cbd75 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -845,7 +845,7 @@ dll_crt0_1 (void *) _my_tls.incyg++; /* Inherit "parent" exec'ed process sigmask */ if (spawn_info && !in_forkee) - _my_tls.sigmask = spawn_info->moreinfo->sigmask; + _my_tls.sigmask = spawn_info->sigmask; if (dynamically_loaded) sigproc_init (); diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc index 62df96652..987dfea37 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -820,7 +820,7 @@ child_info::child_info (unsigned in_cb, child_info_types chtype, msv_count (0), cb (in_cb), intro (PROC_MAGIC_GENERIC), magic (CHILD_INFO_MAGIC), type (chtype), cygheap (::cygheap), cygheap_max (::cygheap_max), flag (0), retry (child_info::retry_count), - rd_proc_pipe (NULL), wr_proc_pipe (NULL) + rd_proc_pipe (NULL), wr_proc_pipe (NULL), sigmask (_my_tls.sigmask) { fhandler_union_cb = sizeof (fhandler_union); user_h = cygwin_user_h; @@ -902,7 +902,6 @@ cygheap_exec_info::alloc () sizeof (cygheap_exec_info) + (chld_procs.count () * sizeof (children[0]))); - res->sigmask = _my_tls.sigmask; return res; } @@ -1353,9 +1352,20 @@ wait_sig (VOID *) threadlist_t *tl_entry; if (!pack.mask) { + /* There's a short time at process startup of a forked process, + when _main_tls points to the system-allocated stack, not to + the parent thread. In that case find_tls fails, and we fetch + the sigmask from the child_info passed from the parent. */ tl_entry = cygheap->find_tls (_main_tls); - dummy_mask = _main_tls->sigmask; - cygheap->unlock_tls (tl_entry); + if (tl_entry) + { + dummy_mask = _main_tls->sigmask; + cygheap->unlock_tls (tl_entry); + } + else if (child_proc_info) + dummy_mask = child_proc_info->sigmask; + else + dummy_mask = 0; pack.mask = &dummy_mask; } |