diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2016-01-10 20:36:12 -0800 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-04-12 09:10:04 -0400 |
| commit | f2f1ca55069617cf85bca3f5f61b4aed9a9866b6 (patch) | |
| tree | 98b17d97af77ff419d3a6bd8ea60ddd0cea1a30b /include/linux | |
| parent | 597a8627d548be5127c774aa0c1204ec04e8b764 (diff) | |
| download | lwn-f2f1ca55069617cf85bca3f5f61b4aed9a9866b6.tar.gz lwn-f2f1ca55069617cf85bca3f5f61b4aed9a9866b6.zip | |
tty: Fix GPF in flush_to_ldisc(), part 2
[ Upstream commit f33798deecbd59a2955f40ac0ae2bc7dff54c069 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'include/linux')
| -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 5171ef8f7b85..4858a3b79b7a 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -574,7 +574,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; |