Commit f33798de authored Jan 10, 2016 by Peter Hurley Committed by Greg Kroah-Hartman Jan 28, 2016

tty: Fix GPF in flush_to_ldisc(), part 2



commit 9ce119f3 ("tty: Fix GPF in flush_to_ldisc()") fixed a
GPF caused by a line discipline which does not define a receive_buf()
method.

However, the vt driver (and speakup driver also) pushes selection
data directly to the line discipline receive_buf() method via
tty_ldisc_receive_buf(). Fix the same problem in tty_ldisc_receive_buf().

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

parent 2d73b069

include/linux/tty.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -579,7 +579,7 @@ static inline int tty_ldisc_receive_buf(struct tty_ldisc ld, unsigned char p,
		count = ld->ops->receive_buf2(ld->tty, p, f, count);
		else {
		count = min_t(int, count, ld->tty->receive_room);
		if (count)
		if (count && ld->ops->receive_buf)
		ld->ops->receive_buf(ld->tty, p, f, count);
		}
		return count;

Admin message