diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-11-10 13:12:35 -0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-02-23 03:51:05 +0000 |
| commit | 1433b66208118028d7f1a5fc235f2660badb6c05 (patch) | |
| tree | 2ecefba4d041720b5e72482916a8018fa1fca7e2 /include | |
| parent | 9b2e057859a2edb5daef515f70fb3db2d3915192 (diff) | |
| download | linux-1433b66208118028d7f1a5fc235f2660badb6c05.tar.gz linux-1433b66208118028d7f1a5fc235f2660badb6c05.tar.bz2 linux-1433b66208118028d7f1a5fc235f2660badb6c05.zip | |
tcp: take care of truncations done by sk_filter()
commit ac6e780070e30e4c35bd395acfe9191e6268bdd3 upstream.
With syzkaller help, Marco Grassi found a bug in TCP stack,
crashing in tcp_collapse()
Root cause is that sk_filter() can truncate the incoming skb,
but TCP stack was not really expecting this to happen.
It probably was expecting a simple DROP or ACCEPT behavior.
We first need to make sure no part of TCP header could be removed.
Then we need to adjust TCP_SKB_CB(skb)->end_seq
Many thanks to syzkaller team and Marco for giving us a reproducer.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Marco Grassi <marco.gra@gmail.com>
Reported-by: Vladis Dronov <vdronov@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/tcp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 0f4e1d419bfb..95c4211f47a7 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -966,6 +966,7 @@ static inline int tcp_prequeue(struct sock *sk, struct sk_buff *skb) return 1; } +int tcp_filter(struct sock *sk, struct sk_buff *skb); #undef STATE_TRACE |