public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Takashi Yano <tyan0@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_3-branch] Cygwin: console: Add missing input_mutex guard. Date: Thu, 28 Jul 2022 15:17:23 +0000 (GMT) [thread overview] Message-ID: <20220728151723.8231638582A1@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=0853f89176eb66f50b015adfa6530983d3aa38ee commit 0853f89176eb66f50b015adfa6530983d3aa38ee Author: Takashi Yano <takashi.yano@nifty.ne.jp> Date: Thu Jul 28 21:52:39 2022 +0900 Cygwin: console: Add missing input_mutex guard. - Setting con.disable_master_thread flag should be guarded by input_mutex, however, it was not. This patch fixes that. Diff: --- winsup/cygwin/fhandler.h | 1 + winsup/cygwin/fhandler_console.cc | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 2b403d06e..e47b38e9a 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -2294,6 +2294,7 @@ private: static void cleanup_for_non_cygwin_app (handle_set_t *p); static void set_console_mode_to_native (); bool need_console_handler (); + static void set_disable_master_thread (bool x); friend tty_min * tty_list::get_cttyp (); }; diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index e080fd6c8..e90b8d5ee 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -790,7 +790,7 @@ fhandler_console::setup_for_non_cygwin_app () (get_ttyp ()->getpgid ()== myself->pgid) ? tty::native : tty::restore; set_input_mode (conmode, &tc ()->ti, get_handle_set ()); set_output_mode (conmode, &tc ()->ti, get_handle_set ()); - con.disable_master_thread = true; + set_disable_master_thread (true); } void @@ -806,7 +806,7 @@ fhandler_console::cleanup_for_non_cygwin_app (handle_set_t *p) (con.owner == myself->pid) ? tty::restore : tty::cygwin; set_output_mode (conmode, ti, p); set_input_mode (conmode, ti, p); - con.disable_master_thread = (con.owner == myself->pid); + set_disable_master_thread (con.owner == myself->pid); } /* Return the tty structure associated with a given tty number. If the @@ -984,7 +984,7 @@ fhandler_console::bg_check (int sig, bool dontsignal) if (sig == SIGTTIN) { set_input_mode (tty::cygwin, &tc ()->ti, get_handle_set ()); - con.disable_master_thread = false; + set_disable_master_thread (false); } if (sig == SIGTTOU) set_output_mode (tty::cygwin, &tc ()->ti, get_handle_set ()); @@ -1715,7 +1715,7 @@ fhandler_console::post_open_setup (int fd) if (fd == 0) { set_input_mode (tty::cygwin, &get_ttyp ()->ti, &handle_set); - con.disable_master_thread = false; + set_disable_master_thread (false); } else if (fd == 1 || fd == 2) set_output_mode (tty::cygwin, &get_ttyp ()->ti, &handle_set); @@ -1743,7 +1743,7 @@ fhandler_console::close () /* Cleaning-up console mode for cygwin apps. */ set_output_mode (tty::restore, &get_ttyp ()->ti, &handle_set); set_input_mode (tty::restore, &get_ttyp ()->ti, &handle_set); - con.disable_master_thread = true; + set_disable_master_thread (true); } } @@ -3969,7 +3969,7 @@ fhandler_console::set_console_mode_to_native () termios *cons_ti = &cons->tc ()->ti; set_input_mode (tty::native, cons_ti, cons->get_handle_set ()); set_output_mode (tty::native, cons_ti, cons->get_handle_set ()); - con.disable_master_thread = true; + set_disable_master_thread (true); break; } } @@ -4322,3 +4322,14 @@ fhandler_console::need_console_handler () { return con.disable_master_thread || con.master_thread_suspended; } + +void +fhandler_console::set_disable_master_thread (bool x) +{ + if (cygheap->ctty->get_major () != DEV_CONS_MAJOR) + return; + fhandler_console *cons = (fhandler_console *) cygheap->ctty; + cons->acquire_input_mutex (mutex_timeout); + con.disable_master_thread = x; + cons->release_input_mutex (); +}
reply other threads:[~2022-07-28 15:17 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=20220728151723.8231638582A1@sourceware.org \ --to=tyan0@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /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: linkBe 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).