diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2014-02-11 16:34:55 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-13 13:02:19 -0500 |
| commit | e2613be5093d04e6589924d36a1e363eef3c87c7 (patch) | |
| tree | fd31a291d7f076ba1776cb490ae0baa75f54c712 /drivers/tty | |
| parent | fb78b811422cd2d8c8605949cc4cc13618347ad5 (diff) | |
n_tty: Fix stale echo output
When echoes cannot be flushed to output (usually because the tty
has no more write room) and L_ECHO is subsequently turned off, then
when L_ECHO is turned back on, stale echoes are output.
Output completed echoes regardless of the L_ECHO setting:
1. before normal writes to that tty
2. if the tty was stopped by soft flow control and is being
restarted
Reported-by: Mikulas Patocka <mpatocka@redhat.com>
Cc: <stable@vger.kernel.org> # 3.13.x
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/n_tty.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index 2747a3b20a50..d15624c1b751 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c | |||
| @@ -817,8 +817,7 @@ static void process_echoes(struct tty_struct *tty) | |||
| 817 | struct n_tty_data *ldata = tty->disc_data; | 817 | struct n_tty_data *ldata = tty->disc_data; |
| 818 | size_t echoed; | 818 | size_t echoed; |
| 819 | 819 | ||
| 820 | if ((!L_ECHO(tty) && !L_ECHONL(tty)) || | 820 | if (ldata->echo_mark == ldata->echo_tail) |
| 821 | ldata->echo_mark == ldata->echo_tail) | ||
| 822 | return; | 821 | return; |
| 823 | 822 | ||
| 824 | mutex_lock(&ldata->output_lock); | 823 | mutex_lock(&ldata->output_lock); |
| @@ -1244,7 +1243,8 @@ n_tty_receive_signal_char(struct tty_struct *tty, int signal, unsigned char c) | |||
| 1244 | if (L_ECHO(tty)) { | 1243 | if (L_ECHO(tty)) { |
| 1245 | echo_char(c, tty); | 1244 | echo_char(c, tty); |
| 1246 | commit_echoes(tty); | 1245 | commit_echoes(tty); |
| 1247 | } | 1246 | } else |
| 1247 | process_echoes(tty); | ||
| 1248 | isig(signal, tty); | 1248 | isig(signal, tty); |
| 1249 | return; | 1249 | return; |
| 1250 | } | 1250 | } |
| @@ -1274,7 +1274,7 @@ n_tty_receive_char_special(struct tty_struct *tty, unsigned char c) | |||
| 1274 | if (I_IXON(tty)) { | 1274 | if (I_IXON(tty)) { |
| 1275 | if (c == START_CHAR(tty)) { | 1275 | if (c == START_CHAR(tty)) { |
| 1276 | start_tty(tty); | 1276 | start_tty(tty); |
| 1277 | commit_echoes(tty); | 1277 | process_echoes(tty); |
| 1278 | return 0; | 1278 | return 0; |
| 1279 | } | 1279 | } |
| 1280 | if (c == STOP_CHAR(tty)) { | 1280 | if (c == STOP_CHAR(tty)) { |
| @@ -1820,8 +1820,10 @@ static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old) | |||
| 1820 | * Fix tty hang when I_IXON(tty) is cleared, but the tty | 1820 | * Fix tty hang when I_IXON(tty) is cleared, but the tty |
| 1821 | * been stopped by STOP_CHAR(tty) before it. | 1821 | * been stopped by STOP_CHAR(tty) before it. |
| 1822 | */ | 1822 | */ |
| 1823 | if (!I_IXON(tty) && old && (old->c_iflag & IXON) && !tty->flow_stopped) | 1823 | if (!I_IXON(tty) && old && (old->c_iflag & IXON) && !tty->flow_stopped) { |
| 1824 | start_tty(tty); | 1824 | start_tty(tty); |
| 1825 | process_echoes(tty); | ||
| 1826 | } | ||
| 1825 | 1827 | ||
| 1826 | /* The termios change make the tty ready for I/O */ | 1828 | /* The termios change make the tty ready for I/O */ |
| 1827 | if (waitqueue_active(&tty->write_wait)) | 1829 | if (waitqueue_active(&tty->write_wait)) |