Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da555db6 authored by Mark Tomlinson's avatar Mark Tomlinson Committed by Greg Kroah-Hartman
Browse files

n_tty: Fix calculation of size in canon_copy_from_read_buf 



There was a hardcoded value of 4096 which should have been N_TTY_BUF_SIZE.
This caused reads from tty to fail with EFAULT when they shouldn't have
done if N_TTY_BUF_SIZE was declared to be something other than 4096.

Signed-off-by: default avatarMark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>
Reviewed-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 392bceed

drivers/tty/n_tty.c

+2 −2
Original line number Diff line number Diff line
@@ -2070,8 +2070,8 @@ static int canon_copy_from_read_buf(struct tty_struct *tty, 


	size = N_TTY_BUF_SIZE - tail;

	n = eol - tail;

	if (n > 4096)

		n += 4096;

	if (n > N_TTY_BUF_SIZE)

		n += N_TTY_BUF_SIZE;

	n += found;

	c = n;