diff options
| author | David S. Miller <davem@davemloft.net> | 2019-01-27 19:43:17 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-27 19:43:17 +0100 |
| commit | 1d68101367a92336e633d0c3681bf8c86644e124 (patch) | |
| tree | 8fdacef561481c25c71641b8fa91a5dfa0ba7f96 /net/ipv6/ip6_gre.c | |
| parent | net: lmc: remove -I. header search path (diff) | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| download | linux-1d68101367a92336e633d0c3681bf8c86644e124.tar.xz linux-1d68101367a92336e633d0c3681bf8c86644e124.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6/ip6_gre.c')
| -rw-r--r-- | net/ipv6/ip6_gre.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index c465d8a102f2..e081e69d534e 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -534,13 +534,9 @@ static int ip6erspan_rcv(struct sk_buff *skb, struct ip6_tnl *tunnel; u8 ver; - if (unlikely(!pskb_may_pull(skb, sizeof(*ershdr)))) - return PACKET_REJECT; - ipv6h = ipv6_hdr(skb); ershdr = (struct erspan_base_hdr *)skb->data; ver = ershdr->ver; - tpi->key = cpu_to_be32(get_session_id(ershdr)); tunnel = ip6gre_tunnel_lookup(skb->dev, &ipv6h->saddr, &ipv6h->daddr, tpi->key, |