From: Takashi Yano <takashi.yano@nifty.ne.jp>
To: cygwin-patches@cygwin.com
Subject: [PATCH] Cygwin: pty: Add still missing acquire/release_attach_mutex.
Date: Thu, 3 Mar 2022 04:50:24 +0900 [thread overview]
Message-ID: <20220302195024.21673-1-takashi.yano@nifty.ne.jp> (raw)
- transfer_input() function uses console api, so it should be guarded
by attach_mutex. However, in most cases, it is missing. This patch
fixes the issue.
---
winsup/cygwin/fhandler_tty.cc | 48 +++++++++++++++++++++++++++++------
1 file changed, 40 insertions(+), 8 deletions(-)
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 433861bb4..43668975f 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1133,8 +1133,10 @@ fhandler_pty_slave::reset_switch_to_nat_pipe (void)
&& get_ttyp ()->pty_input_state_eq (tty::to_nat))
{
WaitForSingleObject (input_mutex, mutex_timeout);
+ acquire_attach_mutex (mutex_timeout);
transfer_input (tty::to_cyg, get_handle_nat (), get_ttyp (),
input_available_event);
+ release_attach_mutex ();
ReleaseMutex (input_mutex);
}
if (get_ttyp ()->master_is_running_as_service
@@ -1237,8 +1239,10 @@ fhandler_pty_slave::reset_switch_to_nat_pipe (void)
&& get_ttyp ()->switch_to_nat_pipe)
{
WaitForSingleObject (input_mutex, mutex_timeout);
+ acquire_attach_mutex (mutex_timeout);
transfer_input (tty::to_cyg, get_handle_nat (), get_ttyp (),
input_available_event);
+ release_attach_mutex ();
ReleaseMutex (input_mutex);
}
}
@@ -1250,8 +1254,12 @@ fhandler_pty_slave::reset_switch_to_nat_pipe (void)
WaitForSingleObject (input_mutex, mutex_timeout);
if (get_ttyp ()->switch_to_nat_pipe && !get_ttyp ()->pcon_activated
&& get_ttyp ()->pty_input_state_eq (tty::to_nat))
- transfer_input (tty::to_cyg, get_handle_nat (), get_ttyp (),
- input_available_event);
+ {
+ acquire_attach_mutex (mutex_timeout);
+ transfer_input (tty::to_cyg, get_handle_nat (), get_ttyp (),
+ input_available_event);
+ release_attach_mutex ();
+ }
ReleaseMutex (input_mutex);
/* Clean up nat pipe state */
get_ttyp ()->pty_input_state = tty::to_cyg;
@@ -1333,11 +1341,19 @@ fhandler_pty_slave::mask_switch_to_nat_pipe (bool mask, bool xfer)
if (!!masked != mask && xfer && (need_gdb_xfer || need_xfer))
{
if (mask && get_ttyp ()->pty_input_state_eq (tty::to_nat))
- transfer_input (tty::to_cyg, get_handle_nat (), get_ttyp (),
- input_available_event);
+ {
+ acquire_attach_mutex (mutex_timeout);
+ transfer_input (tty::to_cyg, get_handle_nat (), get_ttyp (),
+ input_available_event);
+ release_attach_mutex ();
+ }
else if (!mask && get_ttyp ()->pty_input_state_eq (tty::to_cyg))
- transfer_input (tty::to_nat, get_handle (), get_ttyp (),
- input_available_event);
+ {
+ acquire_attach_mutex (mutex_timeout);
+ transfer_input (tty::to_nat, get_handle (), get_ttyp (),
+ input_available_event);
+ release_attach_mutex ();
+ }
}
ReleaseMutex (input_mutex);
}
@@ -2261,9 +2277,11 @@ fhandler_pty_master::write (const void *ptr, size_t len)
if (get_readahead_valid ())
accept_input ();
WaitForSingleObject (input_mutex, mutex_timeout);
+ acquire_attach_mutex (mutex_timeout);
fhandler_pty_slave::transfer_input (tty::to_nat, from_master,
get_ttyp (),
input_available_event);
+ release_attach_mutex ();
ReleaseMutex (input_mutex);
}
get_ttyp ()->pcon_start_pid = 0;
@@ -2315,8 +2333,12 @@ fhandler_pty_master::write (const void *ptr, size_t len)
non-cygwin app is terminated if pseudo console is disabled. */
if (to_be_read_from_nat_pipe () && !get_ttyp ()->pcon_activated
&& get_ttyp ()->pty_input_state == tty::to_cyg)
- fhandler_pty_slave::transfer_input (tty::to_nat, from_master,
- get_ttyp (), input_available_event);
+ {
+ acquire_attach_mutex (mutex_timeout);
+ fhandler_pty_slave::transfer_input (tty::to_nat, from_master,
+ get_ttyp (), input_available_event);
+ release_attach_mutex ();
+ }
ReleaseMutex (input_mutex);
line_edit_status status = line_edit (p, len, ti, &ret);
@@ -4038,8 +4060,10 @@ fhandler_pty_slave::setup_for_non_cygwin_app (bool nopcon, PWCHAR envblock,
&& stdin_is_ptys && get_ttyp ()->pty_input_state_eq (tty::to_cyg))
{
WaitForSingleObject (input_mutex, mutex_timeout);
+ acquire_attach_mutex (mutex_timeout);
transfer_input (tty::to_nat, get_handle (), get_ttyp (),
input_available_event);
+ release_attach_mutex ();
ReleaseMutex (input_mutex);
}
}
@@ -4054,8 +4078,10 @@ fhandler_pty_slave::cleanup_for_non_cygwin_app (handle_set_t *p, tty *ttyp,
&& ttyp->pty_input_state_eq (tty::to_nat))
{
WaitForSingleObject (p->input_mutex, mutex_timeout);
+ acquire_attach_mutex (mutex_timeout);
transfer_input (tty::to_cyg, p->from_master_nat, ttyp,
p->input_available_event);
+ release_attach_mutex ();
ReleaseMutex (p->input_mutex);
}
WaitForSingleObject (p->pipe_sw_mutex, INFINITE);
@@ -4080,8 +4106,10 @@ fhandler_pty_slave::setpgid_aux (pid_t pid)
&& get_ttyp ()->pty_input_state_eq (tty::to_cyg))
{
WaitForSingleObject (input_mutex, mutex_timeout);
+ acquire_attach_mutex (mutex_timeout);
transfer_input (tty::to_nat, get_handle (), get_ttyp (),
input_available_event);
+ release_attach_mutex ();
ReleaseMutex (input_mutex);
}
else if (was_nat_fg && !nat_fg && get_ttyp ()->switch_to_nat_pipe
@@ -4103,11 +4131,15 @@ fhandler_pty_slave::setpgid_aux (pid_t pid)
resume_pid = attach_console_temporarily (target_pid);
attach_restore = true;
}
+ else
+ acquire_attach_mutex (mutex_timeout);
WaitForSingleObject (input_mutex, mutex_timeout);
transfer_input (tty::to_cyg, from, get_ttyp (), input_available_event);
ReleaseMutex (input_mutex);
if (attach_restore)
resume_from_temporarily_attach (resume_pid);
+ else
+ release_attach_mutex ();
}
ReleaseMutex (pipe_sw_mutex);
}
--
2.35.1
reply other threads:[~2022-03-02 19:50 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=20220302195024.21673-1-takashi.yano@nifty.ne.jp \
--to=takashi.yano@nifty.ne.jp \
--cc=cygwin-patches@cygwin.com \
/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: link
Be 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).