JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: AF_UNIX: rework fixup_after_exec

Browse Source 
fhandler_socket_unix::fixup_after_exec incorrectly calls
fhandler_socket_unix::fixup_after_fork with a NULL parent process
handle.  Not only that calling DuplicateHandle with a NULL parent
handle fails, but it's utterly wrong trying to duplicate the handles
at all here.

Rather just set some important values to NULL and reopen the shared
memory region.  Create a fixup_helper method to call common code from
fixup_after_fork and fixup_after_exec.

Add comments to other invocations of fixup_after_fork with NULL
handle to mark them as correct this way.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2020-02-28 13:21:05 +01:00
parent a834dc1ba9
commit 729cb70bcf
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
winsup/cygwin/fhandler_socket_unix.cc
View File

@ -1149,6 +1149,16 @@ fhandler_socket_unix::set_cred ()
scred->gid = myself->gid;
}
void
fhandler_socket_unix::fixup_helper ()
{
if (shmem_handle)
reopen_shmem ();
connect_wait_thr = NULL;
cwt_termination_evt = NULL;
cwt_param = NULL;
}
/* ========================== public methods ========================= */
void
@ -1158,20 +1168,15 @@ fhandler_socket_unix::fixup_after_fork (HANDLE parent)
if (backing_file_handle && backing_file_handle != INVALID_HANDLE_VALUE)
fork_fixup (parent, backing_file_handle, "backing_file_handle");
if (shmem_handle)
{
fork_fixup (parent, shmem_handle, "shmem_handle");
reopen_shmem ();
}
connect_wait_thr = NULL;
cwt_termination_evt = NULL;
cwt_param = NULL;
fork_fixup (parent, shmem_handle, "shmem_handle");
fixup_helper ();
}
void
fhandler_socket_unix::fixup_after_exec ()
{
if (!close_on_exec ())
fixup_after_fork (NULL);
fixup_helper ();
}
void