Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1305830

[PATCH v2 5/9] tty: Fix GPF in flush_to_ldisc(), part 2

Show all headers | View raw

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().

Cc: <stable@vger.kernel.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
 include/linux/tty.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/tty.h b/include/linux/tty.h
index dea7d54..03e4015 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -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;
-- 
2.7.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/9] Misc tty fixes & cleanups Peter Hurley <peter@hurleysoftware.com> - 2016-01-11 05:40 +0100
  [PATCH v2 5/9] tty: Fix GPF in flush_to_ldisc(), part 2 Peter Hurley <peter@hurleysoftware.com> - 2016-01-11 05:40 +0100
  [PATCH v2 9/9] tty: Use test_bit() with tty->flags Peter Hurley <peter@hurleysoftware.com> - 2016-01-11 05:40 +0100
  [PATCH v2 1/9] tty: rocket: Remove private close_wait Peter Hurley <peter@hurleysoftware.com> - 2016-01-11 05:40 +0100
  [PATCH v2 6/9] tty: Unify receive_buf() code paths Peter Hurley <peter@hurleysoftware.com> - 2016-01-11 05:40 +0100
  [PATCH v2 3/9] ia64: Pin controlling tty for unaligned fault message Peter Hurley <peter@hurleysoftware.com> - 2016-01-11 05:40 +0100
  [PATCH v2 8/9] tty: Use termios c_*flag macros Peter Hurley <peter@hurleysoftware.com> - 2016-01-11 05:40 +0100
  [PATCH v2 2/9] n_tty: Ignore all read data when closing Peter Hurley <peter@hurleysoftware.com> - 2016-01-11 05:40 +0100

csiph-web