From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2210) id 3611C3858D39; Fri, 8 Oct 2021 17:29:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3611C3858D39 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Ken Brown To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: pty: Fix master closing error regarding attach_mutex. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/master X-Git-Oldrev: eb03ac17f16f1bd354482148426353fd35cd879d X-Git-Newrev: 8a09deb1b778ddd815270c079931078d01e147f9 Message-Id: <20211008172926.3611C3858D39@sourceware.org> Date: Fri, 8 Oct 2021 17:29:26 +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, 08 Oct 2021 17:29:26 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=8a09deb1b778ddd815270c079931078d01e147f9 commit 8a09deb1b778ddd815270c079931078d01e147f9 Author: Takashi Yano 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