libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-21 00:07:36 +08:00
Code Issues 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 committed by Ken Brown
parent b29320af52
commit 3c504a2a0b
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
winsup/cygwin/fhandler.h
View File

@ -1080,6 +1080,7 @@ class fhandler_socket_unix : public fhandler_socket
void fixup_after_fork (HANDLE parent);
void fixup_after_exec ();
void set_close_on_exec (bool val);
void fixup_helper ();
public:
fhandler_socket_unix ();

2
winsup/cygwin/fhandler_socket_inet.cc
View File

@ -534,7 +534,7 @@ void
fhandler_socket_wsock::fixup_after_exec ()
{
if (need_fixup_before () && !close_on_exec ())
fixup_after_fork (NULL);
fixup_after_fork (NULL); /* No parent handle required. */
}
int

21
winsup/cygwin/fhandler_socket_unix.cc
View File

@ -1194,6 +1194,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
@ -1203,20 +1213,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

2
winsup/cygwin/fhandler_tty.cc
View File

@ -2974,7 +2974,7 @@ fhandler_pty_slave::fixup_after_exec ()
reset_switch_to_pcon ();
if (!close_on_exec ())
fixup_after_fork (NULL);
fixup_after_fork (NULL); /* No parent handle required. */
else if (get_pseudo_console ())
{
int used = 0;