diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2013-11-08 14:42:18 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-04 19:05:40 (GMT) |
| commit | a5ce6dc48a0d0304c7f6588100cf89163a0cea56 (patch) | |
| tree | 901afd7245a5e5cbbcf336e47edd13a684354d68 | |
| parent | eac07f36b141b81c58080a878215b4ca110d090f (diff) | |
| download | linux-fsl-qoriq-a5ce6dc48a0d0304c7f6588100cf89163a0cea56.tar.xz | |
n_tty: Fix echo overrun tail computation
commit 6f2225363c205e186c1465c2c7c84f17c1635504 upstream.
Commit cbfd0340ae1993378fd47179db949e050e16e697,
'n_tty: Process echoes in blocks', introduced an error when
consuming the echo buffer tail to prevent buffer overrun, where
the incorrect operation code byte is checked to determine how
far to advance the tail to the next echo byte.
Check the correct byte for the echo operation code byte.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/n_tty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index 834fb60..f3ef372 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c @@ -768,7 +768,7 @@ static size_t __process_echoes(struct tty_struct *tty) * data at the tail to prevent a subsequent overrun */ while (ldata->echo_commit - tail >= ECHO_DISCARD_WATERMARK) { if (echo_buf(ldata, tail) == ECHO_OP_START) { - if (echo_buf(ldata, tail) == ECHO_OP_ERASE_TAB) + if (echo_buf(ldata, tail + 1) == ECHO_OP_ERASE_TAB) tail += 3; else tail += 2; |