From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tyan0@sourceware.org>
Received: by sourceware.org (Postfix, from userid 7868)
 id 1AC2F3858D28; Sat,  9 Apr 2022 04:42:51 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1AC2F3858D28
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: 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/master
X-Git-Oldrev: db1fbbc4958b77e997fb7e2a3cad4069f3c71936
X-Git-Newrev: 45cfcfbd71a02608db543c2e57371881aad4c0b1
Message-Id: <20220409044251.1AC2F3858D28@sourceware.org>
Date: Sat,  9 Apr 2022 04:42:51 +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:51 -0000

https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D45cfcfbd71a=
02608db543c2e57371881aad4c0b1

commit 45cfcfbd71a02608db543c2e57371881aad4c0b1
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date:   Sat Apr 9 12:59:54 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 4cb5f1411..c02dfb8ed 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -4152,7 +4152,8 @@ void
 fhandler_pty_slave::release_ownership_of_nat_pipe (tty *ttyp,
 						   fhandler_termios *fh)
 {
-  if (fh->get_major () =3D=3D DEV_PTYM_MAJOR)
+  if (fh->get_major () =3D=3D DEV_PTYM_MAJOR
+      && nat_pipe_owner_self (ttyp->nat_pipe_owner_pid))
     {
       fhandler_pty_master *ptym =3D (fhandler_pty_master *) fh;
       WaitForSingleObject (ptym->pipe_sw_mutex, INFINITE);