diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-01-23 13:49:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-23 13:51:56 -0500 |
| commit | 5ca114400dcd46f19f31573e7c60e638bd8d644b (patch) | |
| tree | d78dc56c94548d865e505f022c08006716bdb963 /net/ipv6/tcpv6_offload.c | |
| parent | sctp: reset ret in again path in sctp_for_each_transport (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | wireguard-linux-5ca114400dcd46f19f31573e7c60e638bd8d644b.tar.xz wireguard-linux-5ca114400dcd46f19f31573e7c60e638bd8d644b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
en_rx_am.c was deleted in 'net-next' but had a bug fixed in it in
'net'.
The esp{4,6}_offload.c conflicts were overlapping changes.
The 'out' label is removed so we just return ERR_PTR(-EINVAL)
directly.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcpv6_offload.c')
| -rw-r--r-- | net/ipv6/tcpv6_offload.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/tcpv6_offload.c b/net/ipv6/tcpv6_offload.c index d883c9204c01..278e49cd67d4 100644 --- a/net/ipv6/tcpv6_offload.c +++ b/net/ipv6/tcpv6_offload.c @@ -46,6 +46,9 @@ static struct sk_buff *tcp6_gso_segment(struct sk_buff *skb, { struct tcphdr *th; + if (!(skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)) + return ERR_PTR(-EINVAL); + if (!pskb_may_pull(skb, sizeof(*th))) return ERR_PTR(-EINVAL); |