tcp: take care of truncations done by sk_filter()
authorEric Dumazet <edumazet@google.com>
Thu, 10 Nov 2016 21:12:35 +0000 (13:12 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Nov 2016 09:06:40 +0000 (10:06 +0100)
commit225a24ae97331f3b9d97c1bb97b1e30b3633bcf4
tree717348befe9ab3ccc232de9ba1d105f15e19b9b9
parentae9e052a58ef2357e4b7543901af8f6daf91a0f7
tcp: take care of truncations done by sk_filter()

[ Upstream commit ac6e780070e30e4c35bd395acfe9191e6268bdd3 ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/linux/filter.h
include/net/tcp.h
net/core/filter.c
net/ipv4/tcp_ipv4.c
net/ipv6/tcp_ipv6.c