]> www.infradead.org Git - users/jedix/linux-maple.git/commit
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)
committerChuck Anderson <chuck.anderson@oracle.com>
Sun, 26 Feb 2017 03:35:35 +0000 (19:35 -0800)
commit172b0514ade668f98c7fd50922292007ae067f23
tree3334b5e38923d07fb57046b5063bca47d6f3cfe9
parent70440beae2d041b7e9e45531a791f888e28afce5
tcp: take care of truncations done by sk_filter()

Orabug: 25104761
CVE: CVE-2016-8645

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>
(cherry picked from commit ac6e780070e30e4c35bd395acfe9191e6268bdd3)
Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>
Conflicts:
include/net/tcp.h
net/ipv4/tcp_ipv4.c
include/net/tcp.h
net/ipv4/tcp_ipv4.c
net/ipv6/tcp_ipv6.c