public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Ken Brown <kbrown@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: pty: Fix master closing error regarding attach_mutex. Date: Fri, 8 Oct 2021 17:29:26 +0000 (GMT) [thread overview] Message-ID: <20211008172926.3611C3858D39@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=8a09deb1b778ddd815270c079931078d01e147f9 commit 8a09deb1b778ddd815270c079931078d01e147f9 Author: Takashi Yano <takashi.yano@nifty.ne.jp> Date: Sat Oct 9 01:28:54 2021 +0900 Cygwin: pty: Fix master closing error regarding attach_mutex. - If two or more pty masters are opened in a process, closing master causes error when closing attach_mutex. This patch fixes the issue. Addresses: https://cygwin.com/pipermail/cygwin-developers/2021-October/012418.html Diff: --- winsup/cygwin/fhandler_tty.cc | 7 +++++-- winsup/cygwin/release/3.3.0 | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 05fe5348a..823dabf73 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -57,6 +57,7 @@ struct pipe_reply { }; extern HANDLE attach_mutex; /* Defined in fhandler_console.cc */ +static LONG NO_COPY master_cnt = 0; inline static bool pcon_pid_alive (DWORD pid); @@ -2041,7 +2042,8 @@ fhandler_pty_master::close () } release_output_mutex (); master_fwd_thread->terminate_thread (); - CloseHandle (attach_mutex); + if (InterlockedDecrement (&master_cnt) == 0) + CloseHandle (attach_mutex); } } @@ -2876,7 +2878,8 @@ fhandler_pty_master::setup () if (!(pcon_mutex = CreateMutex (&sa, FALSE, buf))) goto err; - attach_mutex = CreateMutex (&sa, FALSE, NULL); + if (InterlockedIncrement (&master_cnt) == 1) + attach_mutex = CreateMutex (&sa, FALSE, NULL); /* Create master control pipe which allows the master to duplicate the pty pipe handles to processes which deserve it. */ diff --git a/winsup/cygwin/release/3.3.0 b/winsup/cygwin/release/3.3.0 index 2f7340ac5..2df81a4ae 100644 --- a/winsup/cygwin/release/3.3.0 +++ b/winsup/cygwin/release/3.3.0 @@ -71,3 +71,6 @@ Bug Fixes in ps(1) output. Addresses: https://cygwin.com/pipermail/cygwin/2021-July/248998.html https://cygwin.com/pipermail/cygwin/2021-August/249124.html + +- Fix pty master closing error regarding attach_mutex. + Addresses: https://cygwin.com/pipermail/cygwin-developers/2021-October/012418.html
reply other threads:[~2021-10-08 17:29 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211008172926.3611C3858D39@sourceware.org \ --to=kbrown@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).