From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tyan0@sourceware.org>
Received: by sourceware.org (Postfix, from userid 7868)
 id 13AD93858D28; Sat,  9 Apr 2022 04:42:27 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 13AD93858D28
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Takashi Yano <tyan0@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin/cygwin-3_3-branch] Cygwin: pty: Close pseudo console
 only if the process is the owner.
X-Act-Checkin: newlib-cygwin
X-Git-Author: Takashi Yano <takashi.yano@nifty.ne.jp>
X-Git-Refname: refs/heads/cygwin-3_3-branch
X-Git-Oldrev: b88315e74d3983cf28fe7521675dae5d6b78b428
X-Git-Newrev: 7ed6d0249f1f06bb42b13587598fbbb30cf81a82
Message-Id: <20220409044227.13AD93858D28@sourceware.org>
Date: Sat,  9 Apr 2022 04:42:27 +0000 (GMT)
X-BeenThere: cygwin-cvs@cygwin.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Cygwin core component git logs <cygwin-cvs.cygwin.com>
List-Unsubscribe: <https://cygwin.com/mailman/options/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=unsubscribe>
List-Archive: <https://cygwin.com/pipermail/cygwin-cvs/>
List-Help: <mailto:cygwin-cvs-request@cygwin.com?subject=help>
List-Subscribe: <https://cygwin.com/mailman/listinfo/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=subscribe>
X-List-Received-Date: Sat, 09 Apr 2022 04:42:27 -0000

https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D7ed6d0249f1=
f06bb42b13587598fbbb30cf81a82

commit 7ed6d0249f1f06bb42b13587598fbbb30cf81a82
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date:   Sat Apr 9 13:18:22 2022 +0900

    Cygwin: pty: Close pseudo console only if the process is the owner.
   =20
    - Currently, close_pseudoconsole() is called unconditionally from
      fhandler_termios::process_sigs() on Ctrl-C. This causes deadlock
      if Ctrl-C is pressed while setup_pseudoconsole() is called. With
      this patch, close_pseudoconsole() is called only if the master
      process is the owner of the nat-pipe to avoid the deadlock.

Diff:
---
 winsup/cygwin/fhandler_tty.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 367525005..36992324d 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -4138,7 +4138,8 @@ void
 fhandler_pty_slave::close_pseudoconsole_if_necessary (tty *ttyp,
 						      fhandler_termios *fh)
 {
-  if (fh->get_major () =3D=3D DEV_PTYM_MAJOR && ttyp->pcon_activated)
+  if (fh->get_major () =3D=3D DEV_PTYM_MAJOR && ttyp->pcon_activated
+      && pcon_pid_self (ttyp->pcon_pid))
     {
       fhandler_pty_master *ptym =3D (fhandler_pty_master *) fh;
       WaitForSingleObject (ptym->pcon_mutex, INFINITE);