From: Mark Tomlinson Date: Mon, 18 May 2015 00:01:48 +0000 (+1200) Subject: n_tty: Fix calculation of size in canon_copy_from_read_buf X-Git-Tag: v4.1-rc7~4^2~2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=da555db6b06340e3f6b4b0a0448c30bebfe23b0a;p=linux-2.6-block.git 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: Mark Tomlinson Reviewed-by: Peter Hurley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index cc57a3a6b02b..759604e57b24 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c @@ -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;