From: Peter Hurley <peter@hurleysoftware.com>
Date: Mon, 11 Jan 2016 04:36:12 +0000 (-0800)
Subject: tty: Fix GPF in flush_to_ldisc(), part 2
X-Git-Tag: v3.16.35~207
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4bef7cb34421392b046995b7afa7b458fd66f22;p=thirdparty%2Fkernel%2Fstable.git

tty: Fix GPF in flush_to_ldisc(), part 2

commit f33798deecbd59a2955f40ac0ae2bc7dff54c069 upstream.

commit 9ce119f318ba ("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().

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

diff --git a/include/linux/tty.h b/include/linux/tty.h
index 1c3316a47d7e0..1d02392fa3bdc 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -569,7 +569,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;