public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin/cygwin-3_3-branch] Cygwin: pty: Close pseudo console only if the process is the owner.
@ 2022-04-09 4:42 Takashi Yano
0 siblings, 0 replies; only message in thread
From: Takashi Yano @ 2022-04-09 4:42 UTC (permalink / raw)
To: cygwin-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=7ed6d0249f1f06bb42b13587598fbbb30cf81a82
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.
- 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 () == DEV_PTYM_MAJOR && ttyp->pcon_activated)
+ if (fh->get_major () == DEV_PTYM_MAJOR && ttyp->pcon_activated
+ && pcon_pid_self (ttyp->pcon_pid))
{
fhandler_pty_master *ptym = (fhandler_pty_master *) fh;
WaitForSingleObject (ptym->pcon_mutex, INFINITE);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-04-09 4:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-09 4:42 [newlib-cygwin/cygwin-3_3-branch] Cygwin: pty: Close pseudo console only if the process is the owner Takashi Yano
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).