diff options
| author | Willem de Bruijn <willemb@google.com> | 2018-01-19 09:29:18 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-22 16:01:30 -0500 |
| commit | 121d57af308d0cf943f08f4738d24d3966c38cd9 (patch) | |
| tree | 6089dfcad08b4d02fe8e8082f2d278a5cbec05a3 /net/ipv4/tcp_offload.c | |
| parent | 7c68d1a6b4db9012790af7ac0f0fdc0d2083422a (diff) | |
| download | linux-121d57af308d0cf943f08f4738d24d3966c38cd9.tar.gz linux-121d57af308d0cf943f08f4738d24d3966c38cd9.tar.bz2 linux-121d57af308d0cf943f08f4738d24d3966c38cd9.zip | |
gso: validate gso_type in GSO handlers
Validate gso_type during segmentation as SKB_GSO_DODGY sources
may pass packets where the gso_type does not match the contents.
Syzkaller was able to enter the SCTP gso handler with a packet of
gso_type SKB_GSO_TCPV4.
On entry of transport layer gso handlers, verify that the gso_type
matches the transport protocol.
Fixes: 90017accff61 ("sctp: Add GSO support")
Link: http://lkml.kernel.org/r/<001a1137452496ffc305617e5fe0@google.com>
Reported-by: syzbot+fee64147a25aecd48055@syzkaller.appspotmail.com
Signed-off-by: Willem de Bruijn <willemb@google.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_offload.c')
| -rw-r--r-- | net/ipv4/tcp_offload.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/tcp_offload.c b/net/ipv4/tcp_offload.c index b6a2aa1dcf56..4d58e2ce0b5b 100644 --- a/net/ipv4/tcp_offload.c +++ b/net/ipv4/tcp_offload.c @@ -32,6 +32,9 @@ static void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq, static struct sk_buff *tcp4_gso_segment(struct sk_buff *skb, netdev_features_t features) { + if (!(skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4)) + return ERR_PTR(-EINVAL); + if (!pskb_may_pull(skb, sizeof(struct tcphdr))) return ERR_PTR(-EINVAL); |