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: console: Avoid accessing NULL pointer via cygheap->ctty. Date: Fri, 29 Jul 2022 12:59:43 +0000 (GMT) [thread overview] Message-ID: <20220729125943.B46933858429@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=8d564b62b711bc93850c1b6a8632196abc4768cf commit 8d564b62b711bc93850c1b6a8632196abc4768cf Author: Takashi Yano <takashi.yano@nifty.ne.jp> Date: Fri Jul 29 21:40:18 2022 +0900 Cygwin: console: Avoid accessing NULL pointer via cygheap->ctty. - Recent commit "Cygwin: console: Add missing input_mutex guard." has a problem that causes NULL pointer access if cygheap->ctty is NULL. This patch fixes the issue. Diff: --- winsup/cygwin/fhandler.h | 2 +- winsup/cygwin/fhandler_console.cc | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index a12e907ff..e4f1a2d94 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -2298,7 +2298,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); + static void set_disable_master_thread (bool x, fhandler_console *cons = NULL); friend tty_min * tty_list::get_cttyp (); }; diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index 37262f638..d17f03acf 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -791,7 +791,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 ()); - set_disable_master_thread (true); + set_disable_master_thread (true, this); } void @@ -986,7 +986,7 @@ fhandler_console::bg_check (int sig, bool dontsignal) if (sig == SIGTTIN) { set_input_mode (tty::cygwin, &tc ()->ti, get_handle_set ()); - set_disable_master_thread (false); + set_disable_master_thread (false, this); } if (sig == SIGTTOU) set_output_mode (tty::cygwin, &tc ()->ti, get_handle_set ()); @@ -1721,7 +1721,7 @@ fhandler_console::post_open_setup (int fd) if (fd == 0) { set_input_mode (tty::cygwin, &get_ttyp ()->ti, &handle_set); - set_disable_master_thread (false); + set_disable_master_thread (false, this); } else if (fd == 1 || fd == 2) set_output_mode (tty::cygwin, &get_ttyp ()->ti, &handle_set); @@ -1749,7 +1749,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); - set_disable_master_thread (true); + set_disable_master_thread (true, this); } } @@ -3975,7 +3975,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 ()); - set_disable_master_thread (true); + set_disable_master_thread (true, cons); break; } } @@ -4321,11 +4321,17 @@ fhandler_console::need_console_handler () } void -fhandler_console::set_disable_master_thread (bool x) +fhandler_console::set_disable_master_thread (bool x, fhandler_console *cons) { - if (cygheap->ctty->get_major () != DEV_CONS_MAJOR) + if (con.disable_master_thread == x) return; - fhandler_console *cons = (fhandler_console *) cygheap->ctty; + if (cons == NULL) + { + if (cygheap->ctty && cygheap->ctty->get_major () == DEV_CONS_MAJOR) + cons = (fhandler_console *) cygheap->ctty; + else + return; + } cons->acquire_input_mutex (mutex_timeout); con.disable_master_thread = x; cons->release_input_mutex ();
reply other threads:[~2022-07-29 12:59 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=20220729125943.B46933858429@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).