diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-04-04 17:03:18 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-04-04 18:01:07 -0700 |
| commit | cf1ca1f66d301a55ab8e79188ddf347a8d011e35 (patch) | |
| tree | 3482f65987c61b1e46b5862352c8f45ac30442e6 /net/ipv4/ip_gre.c | |
| parent | 1148c4098e918b4ffb3cc222b897c465328d2391 (diff) | |
| parent | c88b9b4cde17aec34fb9bfaf69f9f72a1c44f511 (diff) | |
| download | linux-cf1ca1f66d301a55ab8e79188ddf347a8d011e35.tar.gz linux-cf1ca1f66d301a55ab8e79188ddf347a8d011e35.tar.bz2 linux-cf1ca1f66d301a55ab8e79188ddf347a8d011e35.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
net/ipv4/ip_gre.c
17af420545a7 ("erspan: make sure erspan_base_hdr is present in skb->head")
5832c4a77d69 ("ip_tunnel: convert __be16 tunnel flags to bitmaps")
https://lore.kernel.org/all/20240402103253.3b54a1cf@canb.auug.org.au/
Adjacent changes:
net/ipv6/ip6_fib.c
d21d40605bca ("ipv6: Fix infinite recursion in fib6_dump_done().")
5fc68320c1fb ("ipv6: remove RTNL protection from inet6_dump_fib()")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4/ip_gre.c')
| -rw-r--r-- | net/ipv4/ip_gre.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 3c46a7fef8db..c3af965dc407 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -283,8 +283,13 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi, tunnel = ip_tunnel_lookup(itn, skb->dev->ifindex, flags, iph->saddr, iph->daddr, 0); } else { + if (unlikely(!pskb_may_pull(skb, + gre_hdr_len + sizeof(*ershdr)))) + return PACKET_REJECT; + ershdr = (struct erspan_base_hdr *)(skb->data + gre_hdr_len); ver = ershdr->ver; + iph = ip_hdr(skb); __set_bit(IP_TUNNEL_KEY_BIT, flags); tunnel = ip_tunnel_lookup(itn, skb->dev->ifindex, flags, iph->saddr, iph->daddr, tpi->key); |