diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2016-01-11 07:36:12 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-29 01:13:44 +0300 |
| commit | f33798deecbd59a2955f40ac0ae2bc7dff54c069 (patch) | |
| tree | c1d3337afd9fb69e8ab19c70a5ddab33f0fa06d9 /include/linux/tty.h | |
| parent | 2d73b069f816742ba607f65f9dbbff2885365951 (diff) | |
| download | linux-f33798deecbd59a2955f40ac0ae2bc7dff54c069.tar.xz | |
tty: Fix GPF in flush_to_ldisc(), part 2
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/tty.h')
| -rw-r--r-- | include/linux/tty.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index dea7d54d00d4..03e4015fa033 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; |