n_tty: Fix echo overrun tail computation
Subsystems (2)
PATCH 1/1 n_tty: Fix echo overrun tail computation
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.
Cc <[email protected]> # 3.12.x : c476f65 tty: incorrect test of echo_buf() result for ECHO_OP_START
Cc <[email protected]> # 3.12.x
Signed-off-by Peter Hurley <[email protected]>
--- drivers/tty/n_tty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/n_tty.c +1 -1
@@ -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 ;
Signature · 1 line
1.8.1.2