leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tty: Fix GPF in flush_to_ldisc(), part 2

Browse Source 
commit 9ce119f318 ("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>
This commit is contained in:
Peter Hurley 2016-01-10 20:36:12 -08:00 committed by Greg Kroah-Hartman
parent 2d73b069f8
commit f33798deec
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/tty.h
View File

@ -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); count = ld->ops->receive_buf2(ld->tty, p, f, count);
else { else {
count = min_t(int, count, ld->tty->receive_room); 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); ld->ops->receive_buf(ld->tty, p, f, count);
} }
return count; return count;