From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7868) id 3903D385840C; Fri, 6 May 2022 18:47:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3903D385840C Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Takashi Yano To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_3-branch] Cygwin: always add sigmask to child info X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/cygwin-3_3-branch X-Git-Oldrev: 05827d2df8312e19d564b06af9f8f1a97cf8c1b9 X-Git-Newrev: 7da8066ae8f80da4859201674bc3bfff0e0fe9a2 Message-Id: <20220506184719.3903D385840C@sourceware.org> Date: Fri, 6 May 2022 18:47:19 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 May 2022 18:47:19 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D7da8066ae8f= 80da4859201674bc3bfff0e0fe9a2 commit 7da8066ae8f80da4859201674bc3bfff0e0fe9a2 Author: Corinna Vinschen Date: Tue May 3 15:16:18 2022 +0200 Cygwin: always add sigmask to child info =20 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. =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/child_info.h | 5 +++-- winsup/cygwin/dcrt0.cc | 2 +- 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 505eaef23..d98308b60 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) =20 /* Change this value if you get a message indicating that it is out-of-syn= c. */ -#define CURR_CHILD_INFO_MAGIC 0xecc930b9U +#define CURR_CHILD_INFO_MAGIC 0xacbf4682U =20 #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 31dfd6f03..28b514618 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -849,7 +849,7 @@ dll_crt0_1 (void *) _my_tls.incyg++; /* Inherit "parent" exec'ed process sigmask */ if (spawn_info && !in_forkee) - _my_tls.sigmask =3D spawn_info->moreinfo->sigmask; + _my_tls.sigmask =3D spawn_info->sigmask; =20 if (dynamically_loaded) sigproc_init (); diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc index e923f4ede..b5143e853 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -820,7 +820,7 @@ child_info::child_info (unsigned in_cb, child_info_type= s chtype, 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) + wr_proc_pipe (NULL), sigmask (_my_tls.sigmask) { /* It appears that when running under WOW64 on Vista 64, the first DWORD value in the datastructure lpReserved2 is pointing to (msv_count in @@ -922,7 +922,6 @@ cygheap_exec_info::alloc () sizeof (cygheap_exec_info) + (chld_procs.count () * sizeof (children[0]))); - res->sigmask =3D _my_tls.sigmask; return res; } =20 @@ -1373,9 +1372,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 =3D cygheap->find_tls (_main_tls); - dummy_mask =3D _main_tls->sigmask; - cygheap->unlock_tls (tl_entry); + if (tl_entry) + { + dummy_mask =3D _main_tls->sigmask; + cygheap->unlock_tls (tl_entry); + } + else if (child_proc_info) + dummy_mask =3D child_proc_info->sigmask; + else + dummy_mask =3D 0; pack.mask =3D &dummy_mask; }