Commit c77569d2 authored Nov 22, 2013 by Peter Hurley Committed by Greg Kroah-Hartman Nov 25, 2013

n_tty: Fix 4096-byte canonical reads



Although the maximum allowable canonical line is specified to
be 255 bytes (MAX_CANON), the practical limit has actually been
the size of the line discipline read buffer (N_TTY_BUF_SIZE == 4096).

Commit 32f13521,
n_tty: Line copy to user buffer in canonical mode, limited the
line copy to 4095 bytes. With a completely full line discipline
read buffer and a userspace buffer > 4095, _no_ data was copied,
and the read() syscall returned 0, indicating EOF.

Fix the interval arithmetic to compute the correct number of bytes
to copy to userspace in the range [1..4096].

Cc: <stable@vger.kernel.org> # 3.12.x
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 6f222536

drivers/tty/n_tty.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1998,7 +1998,10 @@ static int canon_copy_from_read_buf(struct tty_struct *tty,
		found = 1;

		size = N_TTY_BUF_SIZE - tail;
		n = (found + eol + size) & (N_TTY_BUF_SIZE - 1);
		n = eol - tail;
		if (n > 4096)
		n += 4096;
		n += found;
		c = n;

		if (found && read_buf(ldata, eol) == __DISABLED_CHAR) {

Admin message