ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

su: fix --pty terminal initialization 

* use proper winsize rather than uninitialized variable (Oops...)

* set the current terminal to the raw mode

* disable ECHO for non-terminal execution to be compatible with
  non-pty output

Addresses: https://github.com/karelzak/util-linux/issues/767
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2019-03-06 11:54:51 +01:00
parent 2648be66d2
commit 282ca3d87b
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
login-utils/su-common.c
View File

@ -276,29 +276,26 @@ static void pty_create(struct su_context *su)
if (su->isterm) {
DBG(PTY, ul_debug("create for terminal"));
struct winsize win;
/* original setting of the current terminal */
if (tcgetattr(STDIN_FILENO, &su->stdin_attrs) != 0)
err(EXIT_FAILURE, _("failed to get terminal attributes"));
ioctl(STDIN_FILENO, TIOCGWINSZ, (char *)&su->win);
/* create master+slave */
rc = openpty(&su->pty_master, &su->pty_slave, NULL, &su->stdin_attrs, &su->win);
/* reuse the current terminal setting for slave */
/* set the current terminal to raw mode; pty_cleanup() reverses this change on exit */
slave_attrs = su->stdin_attrs;
cfmakeraw(&slave_attrs);
ioctl(STDIN_FILENO, TIOCGWINSZ, (char *)&su->win);
/* create master+slave */
rc = openpty(&su->pty_master, &su->pty_slave, NULL, &slave_attrs, &win);
slave_attrs.c_lflag &= ~ECHO;
tcsetattr(STDIN_FILENO, TCSANOW, &slave_attrs);
} else {
DBG(PTY, ul_debug("create for non-terminal"));
rc = openpty(&su->pty_master, &su->pty_slave, NULL, NULL, NULL);
/* set slave attributes */
if (!rc) {
tcgetattr(su->pty_slave, &slave_attrs);
cfmakeraw(&slave_attrs);
slave_attrs.c_lflag &= ~ECHO;
tcsetattr(su->pty_slave, TCSANOW, &slave_attrs);
}
}
@ -311,12 +308,14 @@ static void pty_create(struct su_context *su)
static void pty_cleanup(struct su_context *su)
{
if (su->pty_master == -1)
struct termios rtt;
if (su->pty_master == -1 || !su->isterm)
return;
DBG(PTY, ul_debug("cleanup"));
if (su->isterm)
tcsetattr(STDIN_FILENO, TCSADRAIN, &su->stdin_attrs);
rtt = su->stdin_attrs;
tcsetattr(STDIN_FILENO, TCSADRAIN, &rtt);
}
static int write_output(char *obuf, ssize_t bytes)