libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-09 02:29:07 +08:00
Code Issues Projects Releases Wiki Activity

Cygwin: pty: Make master thread functions be static.

Browse Source 
- The functions pty_master_thread() and pty_master_fwd_thread()
  should be static (i.e. should not access class member) because
  the instance is deleted if the master is dup()'ed and the first
  master is closed. In this case, because the dup()'ed instance
  still exists, these master threads are also still alive even
  though the instance has been deleted. As a result, accesing
  class members in these functions causes accessi violation.

  Addresses:
  https://cygwin.com/pipermail/cygwin-developers/2021-January/012030.html
This commit is contained in:
Takashi Yano via Cygwin-patches 2021-01-15 17:32:13 +09:00 committed by Ken Brown
parent 652edb0299
commit ea3f6daab4
2 changed files with 128 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
winsup/cygwin/fhandler.h
View File

@ -2465,8 +2465,9 @@ class fhandler_pty_common: public fhandler_termios
void resize_pseudo_console (struct winsize *); void resize_pseudo_console (struct winsize *);
protected: protected:
BOOL process_opost_output (HANDLE h, static BOOL process_opost_output (HANDLE h, const void *ptr, ssize_t& len,
const void *ptr, ssize_t& len, bool is_echo); bool is_echo, tty *ttyp,
bool is_nonblocking);
}; };
class fhandler_pty_slave: public fhandler_pty_common class fhandler_pty_slave: public fhandler_pty_common
@ -2545,6 +2546,24 @@ class fhandler_pty_slave: public fhandler_pty_common
#define __ptsname(buf, unit) __small_sprintf ((buf), "/dev/pty%d", (unit)) #define __ptsname(buf, unit) __small_sprintf ((buf), "/dev/pty%d", (unit))
class fhandler_pty_master: public fhandler_pty_common class fhandler_pty_master: public fhandler_pty_common
{ {
public:
/* Parameter set for the static function pty_master_thread() */
struct master_thread_param_t {
HANDLE from_master;
HANDLE from_master_cyg;
HANDLE to_master;
HANDLE to_master_cyg;
HANDLE master_ctl;
HANDLE input_available_event;
};
/* Parameter set for the static function pty_master_fwd_thread() */
struct master_fwd_thread_param_t {
HANDLE to_master_cyg;
HANDLE from_slave;
HANDLE output_mutex;
tty *ttyp;
};
private:
int pktmode; // non-zero if pty in a packet mode. int pktmode; // non-zero if pty in a packet mode.
HANDLE master_ctl; // Control socket for handle duplication HANDLE master_ctl; // Control socket for handle duplication
cygthread *master_thread; // Master control thread cygthread *master_thread; // Master control thread
@ -2553,14 +2572,15 @@ class fhandler_pty_master: public fhandler_pty_common
DWORD dwProcessId; // Owner of master handles DWORD dwProcessId; // Owner of master handles
HANDLE to_master_cyg, from_master_cyg; HANDLE to_master_cyg, from_master_cyg;
cygthread *master_fwd_thread; // Master forwarding thread cygthread *master_fwd_thread; // Master forwarding thread
HANDLE thread_param_copied_event;
public: public:
HANDLE get_echo_handle () const { return echo_r; } HANDLE get_echo_handle () const { return echo_r; }
/* Constructor */ /* Constructor */
fhandler_pty_master (int); fhandler_pty_master (int);
DWORD pty_master_thread (); static DWORD pty_master_thread (const master_thread_param_t *p);
DWORD pty_master_fwd_thread (); static DWORD pty_master_fwd_thread (const master_fwd_thread_param_t *p);
int process_slave_output (char *buf, size_t len, int pktmode_on); int process_slave_output (char *buf, size_t len, int pktmode_on);
void doecho (const void *str, DWORD len); void doecho (const void *str, DWORD len);
int accept_input (); int accept_input ();
@ -2605,6 +2625,8 @@ public:
return fh; return fh;
} }
bool to_be_read_from_pcon (void); bool to_be_read_from_pcon (void);
void get_master_thread_param (master_thread_param_t *p);
void get_master_fwd_thread_param (master_fwd_thread_param_t *p);
}; };
class fhandler_dev_null: public fhandler_base class fhandler_dev_null: public fhandler_base

154
winsup/cygwin/fhandler_tty.cc
View File

@ -293,7 +293,8 @@ fhandler_pty_master::doecho (const void *str, DWORD len)
{ {
ssize_t towrite = len; ssize_t towrite = len;
acquire_output_mutex (INFINITE); acquire_output_mutex (INFINITE);
if (!process_opost_output (echo_w, str, towrite, true)) if (!process_opost_output (echo_w, str, towrite, true,
get_ttyp (), is_nonblocking ()))
termios_printf ("Write to echo pipe failed, %E"); termios_printf ("Write to echo pipe failed, %E");
release_output_mutex (); release_output_mutex ();
} }
@ -866,7 +867,8 @@ fhandler_pty_slave::write (const void *ptr, size_t len)
reset_switch_to_pcon (); reset_switch_to_pcon ();
acquire_output_mutex (INFINITE); acquire_output_mutex (INFINITE);
if (!process_opost_output (get_output_handle_cyg (), ptr, towrite, false)) if (!process_opost_output (get_output_handle_cyg (), ptr, towrite, false,
get_ttyp (), is_nonblocking ()))
{ {
DWORD err = GetLastError (); DWORD err = GetLastError ();
termios_printf ("WriteFile failed, %E"); termios_printf ("WriteFile failed, %E");
@ -2196,8 +2198,15 @@ fhandler_pty_slave::fixup_after_exec ()
calls to CallNamedPipe should have a big enough timeout value. For now this calls to CallNamedPipe should have a big enough timeout value. For now this
is 500ms. Hope that's enough. */ is 500ms. Hope that's enough. */
/* The function pty_master_thread() should be static because the instance
is deleted if the master is dup()'ed and the original is closed. In
this case, dup()'ed instance still exists, therefore, master thread
is also still alive even though the instance has been deleted. As a
result, accesing member variables in this function causes access
violation. */
DWORD DWORD
fhandler_pty_master::pty_master_thread () fhandler_pty_master::pty_master_thread (const master_thread_param_t *p)
{ {
bool exit = false; bool exit = false;
GENERIC_MAPPING map = { EVENT_QUERY_STATE, EVENT_MODIFY_STATE, 0, GENERIC_MAPPING map = { EVENT_QUERY_STATE, EVENT_MODIFY_STATE, 0,
@ -2211,7 +2220,7 @@ fhandler_pty_master::pty_master_thread ()
NTSTATUS status; NTSTATUS status;
termios_printf ("Entered"); termios_printf ("Entered");
while (!exit && (ConnectNamedPipe (master_ctl, NULL) while (!exit && (ConnectNamedPipe (p->master_ctl, NULL)
|| GetLastError () == ERROR_PIPE_CONNECTED)) || GetLastError () == ERROR_PIPE_CONNECTED))
{ {
pipe_reply repl = { NULL, NULL, NULL, NULL, 0 }; pipe_reply repl = { NULL, NULL, NULL, NULL, 0 };
@ -2220,21 +2229,21 @@ fhandler_pty_master::pty_master_thread ()
ACCESS_MASK access = EVENT_MODIFY_STATE; ACCESS_MASK access = EVENT_MODIFY_STATE;
HANDLE client = NULL; HANDLE client = NULL;
if (!ReadFile (master_ctl, &req, sizeof req, &len, NULL)) if (!ReadFile (p->master_ctl, &req, sizeof req, &len, NULL))
{ {
termios_printf ("ReadFile, %E"); termios_printf ("ReadFile, %E");
goto reply; goto reply;
} }
if (!GetNamedPipeClientProcessId (master_ctl, &pid)) if (!GetNamedPipeClientProcessId (p->master_ctl, &pid))
pid = req.pid; pid = req.pid;
if (get_object_sd (input_available_event, sd)) if (get_object_sd (p->input_available_event, sd))
{ {
termios_printf ("get_object_sd, %E"); termios_printf ("get_object_sd, %E");
goto reply; goto reply;
} }
cygheap->user.deimpersonate (); cygheap->user.deimpersonate ();
deimp = true; deimp = true;
if (!ImpersonateNamedPipeClient (master_ctl)) if (!ImpersonateNamedPipeClient (p->master_ctl))
{ {
termios_printf ("ImpersonateNamedPipeClient, %E"); termios_printf ("ImpersonateNamedPipeClient, %E");
goto reply; goto reply;
@ -2277,28 +2286,28 @@ fhandler_pty_master::pty_master_thread ()
termios_printf ("OpenProcess, %E"); termios_printf ("OpenProcess, %E");
goto reply; goto reply;
} }
if (!DuplicateHandle (GetCurrentProcess (), from_master, if (!DuplicateHandle (GetCurrentProcess (), p->from_master,
client, &repl.from_master, client, &repl.from_master,
0, TRUE, DUPLICATE_SAME_ACCESS)) 0, TRUE, DUPLICATE_SAME_ACCESS))
{ {
termios_printf ("DuplicateHandle (from_master), %E"); termios_printf ("DuplicateHandle (from_master), %E");
goto reply; goto reply;
} }
if (!DuplicateHandle (GetCurrentProcess (), from_master_cyg, if (!DuplicateHandle (GetCurrentProcess (), p->from_master_cyg,
client, &repl.from_master_cyg, client, &repl.from_master_cyg,
0, TRUE, DUPLICATE_SAME_ACCESS)) 0, TRUE, DUPLICATE_SAME_ACCESS))
{ {
termios_printf ("DuplicateHandle (from_master_cyg), %E"); termios_printf ("DuplicateHandle (from_master_cyg), %E");
goto reply; goto reply;
} }
if (!DuplicateHandle (GetCurrentProcess (), to_master, if (!DuplicateHandle (GetCurrentProcess (), p->to_master,
client, &repl.to_master, client, &repl.to_master,
0, TRUE, DUPLICATE_SAME_ACCESS)) 0, TRUE, DUPLICATE_SAME_ACCESS))
{ {
termios_printf ("DuplicateHandle (to_master), %E"); termios_printf ("DuplicateHandle (to_master), %E");
goto reply; goto reply;
} }
if (!DuplicateHandle (GetCurrentProcess (), to_master_cyg, if (!DuplicateHandle (GetCurrentProcess (), p->to_master_cyg,
client, &repl.to_master_cyg, client, &repl.to_master_cyg,
0, TRUE, DUPLICATE_SAME_ACCESS)) 0, TRUE, DUPLICATE_SAME_ACCESS))
{ {
@ -2315,9 +2324,9 @@ reply:
sd.free (); sd.free ();
termios_printf ("Reply: from %p, to %p, error %u", termios_printf ("Reply: from %p, to %p, error %u",
repl.from_master, repl.to_master, repl.error ); repl.from_master, repl.to_master, repl.error );
if (!WriteFile (master_ctl, &repl, sizeof repl, &len, NULL)) if (!WriteFile (p->master_ctl, &repl, sizeof repl, &len, NULL))
termios_printf ("WriteFile, %E"); termios_printf ("WriteFile, %E");
if (!DisconnectNamedPipe (master_ctl)) if (!DisconnectNamedPipe (p->master_ctl))
termios_printf ("DisconnectNamedPipe, %E"); termios_printf ("DisconnectNamedPipe, %E");
} }
termios_printf ("Leaving"); termios_printf ("Leaving");
@ -2327,11 +2336,20 @@ reply:
static DWORD WINAPI static DWORD WINAPI
pty_master_thread (VOID *arg) pty_master_thread (VOID *arg)
{ {
return ((fhandler_pty_master *) arg)->pty_master_thread (); fhandler_pty_master::master_thread_param_t p;
((fhandler_pty_master *) arg)->get_master_thread_param (&p);
return fhandler_pty_master::pty_master_thread (&p);
} }
/* The function pty_master_fwd_thread() should be static because the
instance is deleted if the master is dup()'ed and the original is
closed. In this case, dup()'ed instance still exists, therefore,
master forwarding thread is also still alive even though the instance
has been deleted. As a result, accesing member variables in this
function causes access violation. */
DWORD DWORD
fhandler_pty_master::pty_master_fwd_thread () fhandler_pty_master::pty_master_fwd_thread (const master_fwd_thread_param_t *p)
{ {
DWORD rlen; DWORD rlen;
tmp_pathbuf tp; tmp_pathbuf tp;
@ -2342,17 +2360,17 @@ fhandler_pty_master::pty_master_fwd_thread ()
termios_printf ("Started."); termios_printf ("Started.");
for (;;) for (;;)
{ {
get_ttyp ()->pcon_last_time = GetTickCount (); p->ttyp->pcon_last_time = GetTickCount ();
if (!ReadFile (from_slave, outbuf, NT_MAX_PATH, &rlen, NULL)) if (!ReadFile (p->from_slave, outbuf, NT_MAX_PATH, &rlen, NULL))
{ {
termios_printf ("ReadFile for forwarding failed, %E"); termios_printf ("ReadFile for forwarding failed, %E");
break; break;
} }
ssize_t wlen = rlen; ssize_t wlen = rlen;
char *ptr = outbuf; char *ptr = outbuf;
if (get_ttyp ()->h_pseudo_console) if (p->ttyp->h_pseudo_console)
{ {
if (!get_ttyp ()->has_set_title) if (!p->ttyp->has_set_title)
{ {
/* Remove Set title sequence */ /* Remove Set title sequence */
char *p0, *p1; char *p0, *p1;
@ -2424,10 +2442,10 @@ fhandler_pty_master::pty_master_fwd_thread ()
else else
state = 0; state = 0;
if (get_ttyp ()->term_code_page != CP_UTF8) if (p->ttyp->term_code_page != CP_UTF8)
{ {
size_t nlen = NT_MAX_PATH; size_t nlen = NT_MAX_PATH;
convert_mb_str (get_ttyp ()->term_code_page, mbbuf, &nlen, convert_mb_str (p->ttyp->term_code_page, mbbuf, &nlen,
CP_UTF8, ptr, wlen, &mbp); CP_UTF8, ptr, wlen, &mbp);
ptr = mbbuf; ptr = mbbuf;
@ -2439,7 +2457,7 @@ fhandler_pty_master::pty_master_fwd_thread ()
DWORD written; DWORD written;
while (rlen>0) while (rlen>0)
{ {
if (!WriteFile (to_master_cyg, ptr, wlen, &written, NULL)) if (!WriteFile (p->to_master_cyg, ptr, wlen, &written, NULL))
{ {
termios_printf ("WriteFile for forwarding failed, %E"); termios_printf ("WriteFile for forwarding failed, %E");
break; break;
@ -2451,7 +2469,7 @@ fhandler_pty_master::pty_master_fwd_thread ()
} }
UINT cp_from; UINT cp_from;
pinfo pinfo_target = pinfo (get_ttyp ()->invisible_console_pid); pinfo pinfo_target = pinfo (p->ttyp->invisible_console_pid);
DWORD target_pid = 0; DWORD target_pid = 0;
if (pinfo_target) if (pinfo_target)
target_pid = pinfo_target->dwProcessId; target_pid = pinfo_target->dwProcessId;
@ -2476,20 +2494,21 @@ fhandler_pty_master::pty_master_fwd_thread ()
else else
cp_from = GetConsoleOutputCP (); cp_from = GetConsoleOutputCP ();
if (get_ttyp ()->term_code_page != cp_from) if (p->ttyp->term_code_page != cp_from)
{ {
size_t nlen = NT_MAX_PATH; size_t nlen = NT_MAX_PATH;
convert_mb_str (get_ttyp ()->term_code_page, mbbuf, &nlen, convert_mb_str (p->ttyp->term_code_page, mbbuf, &nlen,
cp_from, ptr, wlen, &mbp); cp_from, ptr, wlen, &mbp);
ptr = mbbuf; ptr = mbbuf;
wlen = rlen = nlen; wlen = rlen = nlen;
} }
acquire_output_mutex (INFINITE); WaitForSingleObject (p->output_mutex, INFINITE);
while (rlen>0) while (rlen>0)
{ {
if (!process_opost_output (to_master_cyg, ptr, wlen, false)) if (!process_opost_output (p->to_master_cyg, ptr, wlen, false,
p->ttyp, false))
{ {
termios_printf ("WriteFile for forwarding failed, %E"); termios_printf ("WriteFile for forwarding failed, %E");
break; break;
@ -2497,7 +2516,7 @@ fhandler_pty_master::pty_master_fwd_thread ()
ptr += wlen; ptr += wlen;
wlen = (rlen -= wlen); wlen = (rlen -= wlen);
} }
release_output_mutex (); ReleaseMutex (p->output_mutex);
} }
return 0; return 0;
} }
@ -2505,7 +2524,9 @@ fhandler_pty_master::pty_master_fwd_thread ()
static DWORD WINAPI static DWORD WINAPI
pty_master_fwd_thread (VOID *arg) pty_master_fwd_thread (VOID *arg)
{ {
return ((fhandler_pty_master *) arg)->pty_master_fwd_thread (); fhandler_pty_master::master_fwd_thread_param_t p;
((fhandler_pty_master *) arg)->get_master_fwd_thread_param (&p);
return fhandler_pty_master::pty_master_fwd_thread (&p);
} }
bool bool
@ -2553,6 +2574,15 @@ fhandler_pty_master::setup ()
goto err; goto err;
} }
__small_sprintf (pipename, "pty%d-to-slave", unit);
res = fhandler_pipe::create (&sec_none, &from_master, &to_slave,
fhandler_pty_common::pipesize, pipename, 0);
if (res)
{
errstr = "input pipe";
goto err;
}
ProtectHandle1 (from_slave, from_pty); ProtectHandle1 (from_slave, from_pty);
__small_sprintf (pipename, "pty%d-echoloop", unit); __small_sprintf (pipename, "pty%d-echoloop", unit);
@ -2607,27 +2637,23 @@ fhandler_pty_master::setup ()
errstr = "pty master control pipe"; errstr = "pty master control pipe";
goto err; goto err;
} }
thread_param_copied_event = CreateEvent(NULL, FALSE, FALSE, NULL);
master_thread = new cygthread (::pty_master_thread, this, "ptym"); master_thread = new cygthread (::pty_master_thread, this, "ptym");
if (!master_thread) if (!master_thread)
{ {
errstr = "pty master control thread"; errstr = "pty master control thread";
goto err; goto err;
} }
WaitForSingleObject (thread_param_copied_event, INFINITE);
master_fwd_thread = new cygthread (::pty_master_fwd_thread, this, "ptymf"); master_fwd_thread = new cygthread (::pty_master_fwd_thread, this, "ptymf");
if (!master_fwd_thread) if (!master_fwd_thread)
{ {
errstr = "pty master forwarding thread"; errstr = "pty master forwarding thread";
goto err; goto err;
} }
WaitForSingleObject (thread_param_copied_event, INFINITE);
__small_sprintf (pipename, "pty%d-to-slave", unit); CloseHandle (thread_param_copied_event);
res = fhandler_pipe::create (&sec_none, &from_master, &to_slave,
fhandler_pty_common::pipesize, pipename, 0);
if (res)
{
errstr = "input pipe";
goto err;
}
t.set_from_master (from_master); t.set_from_master (from_master);
t.set_from_master_cyg (from_master_cyg); t.set_from_master_cyg (from_master_cyg);
@ -2704,7 +2730,9 @@ fhandler_pty_master::fixup_after_exec ()
} }
BOOL BOOL
fhandler_pty_common::process_opost_output (HANDLE h, const void *ptr, ssize_t& len, bool is_echo) fhandler_pty_common::process_opost_output (HANDLE h, const void *ptr,
ssize_t& len, bool is_echo,
tty *ttyp, bool is_nonblocking)
{ {
ssize_t towrite = len; ssize_t towrite = len;
BOOL res = TRUE; BOOL res = TRUE;
@ -2712,7 +2740,7 @@ fhandler_pty_common::process_opost_output (HANDLE h, const void *ptr, ssize_t& l
{ {
if (!is_echo) if (!is_echo)
{ {
if (tc ()->output_stopped && is_nonblocking ()) if (ttyp->output_stopped && is_nonblocking)
{ {
if (towrite < len) if (towrite < len)
break; break;
@ -2723,11 +2751,11 @@ fhandler_pty_common::process_opost_output (HANDLE h, const void *ptr, ssize_t& l
return TRUE; return TRUE;
} }
} }
while (tc ()->output_stopped) while (ttyp->output_stopped)
cygwait (10); cygwait (10);
} }
if (!(get_ttyp ()->ti.c_oflag & OPOST)) // raw output mode if (!(ttyp->ti.c_oflag & OPOST)) // raw output mode
{ {
DWORD n = MIN (OUT_BUFFER_SIZE, towrite); DWORD n = MIN (OUT_BUFFER_SIZE, towrite);
res = WriteFile (h, ptr, n, &n, NULL); res = WriteFile (h, ptr, n, &n, NULL);
@ -2747,13 +2775,13 @@ fhandler_pty_common::process_opost_output (HANDLE h, const void *ptr, ssize_t& l
switch (buf[rc]) switch (buf[rc])
{ {
case '\r': case '\r':
if ((get_ttyp ()->ti.c_oflag & ONOCR) if ((ttyp->ti.c_oflag & ONOCR)
&& get_ttyp ()->column == 0) && ttyp->column == 0)
{ {
rc++; rc++;
continue; continue;
} }
if (get_ttyp ()->ti.c_oflag & OCRNL) if (ttyp->ti.c_oflag & OCRNL)
{ {
outbuf[n++] = '\n'; outbuf[n++] = '\n';
rc++; rc++;
@ -2761,22 +2789,22 @@ fhandler_pty_common::process_opost_output (HANDLE h, const void *ptr, ssize_t& l
else else
{ {
outbuf[n++] = buf[rc++]; outbuf[n++] = buf[rc++];
get_ttyp ()->column = 0; ttyp->column = 0;
} }
break; break;
case '\n': case '\n':
if (get_ttyp ()->ti.c_oflag & ONLCR) if (ttyp->ti.c_oflag & ONLCR)
{ {
outbuf[n++] = '\r'; outbuf[n++] = '\r';
get_ttyp ()->column = 0; ttyp->column = 0;
} }
if (get_ttyp ()->ti.c_oflag & ONLRET) if (ttyp->ti.c_oflag & ONLRET)
get_ttyp ()->column = 0; ttyp->column = 0;
outbuf[n++] = buf[rc++]; outbuf[n++] = buf[rc++];
break; break;
default: default:
outbuf[n++] = buf[rc++]; outbuf[n++] = buf[rc++];
get_ttyp ()->column++; ttyp->column++;
break; break;
} }
} }
@ -3118,3 +3146,25 @@ fhandler_pty_slave::create_invisible_console ()
this process becomes the primary. */ this process becomes the primary. */
get_ttyp ()->invisible_console_pid = myself->pid; get_ttyp ()->invisible_console_pid = myself->pid;
} }
void
fhandler_pty_master::get_master_thread_param (master_thread_param_t *p)
{
p->from_master = from_master;
p->from_master_cyg = from_master_cyg;
p->to_master = to_master;
p->to_master_cyg = to_master_cyg;
p->master_ctl = master_ctl;
p->input_available_event = input_available_event;
SetEvent (thread_param_copied_event);
}
void
fhandler_pty_master::get_master_fwd_thread_param (master_fwd_thread_param_t *p)
{
p->to_master_cyg = to_master_cyg;
p->from_slave = from_slave;
p->output_mutex = output_mutex;
p->ttyp = get_ttyp ();
SetEvent (thread_param_copied_event);
}