From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 5 Apr 2024 00:03:18 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.10-rc1~153^2~356
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf1ca1f66d301a55ab8e79188ddf347a8d011e35;p=thirdparty%2Flinux.git

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>
---

cf1ca1f66d301a55ab8e79188ddf347a8d011e35
diff --cc net/ipv4/ip_gre.c
index 3c46a7fef8db8,57ddcd8c62f67..c3af965dc4078
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@@ -279,14 -276,19 +279,19 @@@ static int erspan_rcv(struct sk_buff *s
  	iph = ip_hdr(skb);
  	if (is_erspan_type1(gre_hdr_len)) {
  		ver = 0;
 -		tunnel = ip_tunnel_lookup(itn, skb->dev->ifindex,
 -					  tpi->flags | TUNNEL_NO_KEY,
 +		__set_bit(IP_TUNNEL_NO_KEY_BIT, flags);
 +		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);
 -		tunnel = ip_tunnel_lookup(itn, skb->dev->ifindex,
 -					  tpi->flags | TUNNEL_KEY,
 +		__set_bit(IP_TUNNEL_KEY_BIT, flags);
 +		tunnel = ip_tunnel_lookup(itn, skb->dev->ifindex, flags,
  					  iph->saddr, iph->daddr, tpi->key);
  	}
  
diff --cc net/ipv6/ip6_fib.c
index 284002a2a8905,7209419cfb0e9..ddd8e3c2df4a5
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@@ -650,21 -651,19 +650,21 @@@ static int inet6_dump_fib(struct sk_buf
  	if (!w) {
  		/* New dump:
  		 *
- 		 * 1. hook callback destructor.
- 		 */
- 		cb->args[3] = (long)cb->done;
- 		cb->done = fib6_dump_done;
- 
- 		/*
- 		 * 2. allocate and initialize walker.
+ 		 * 1. allocate and initialize walker.
  		 */
  		w = kzalloc(sizeof(*w), GFP_ATOMIC);
 -		if (!w)
 -			return -ENOMEM;
 +		if (!w) {
 +			err = -ENOMEM;
 +			goto unlock;
 +		}
  		w->func = fib6_dump_node;
  		cb->args[2] = (long)w;
+ 
+ 		/* 2. hook callback destructor.
+ 		 */
+ 		cb->args[3] = (long)cb->done;
+ 		cb->done = fib6_dump_done;
+ 
  	}
  
  	arg.skb = skb;