Commit e7f3dd28 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'reuseport-fixes' 



Martin Lau says:

====================
s series has fixes when running reuseport's bpf_prog for udp lookup.
If there is reuseport's bpf_prog, the common issue is the reuseport code
path expects skb->data pointing to the transport header (udphdr here).
A couple of commits broke this expectation.  The issue is specific
to running bpf_prog, so bpf tag is used for this series.

Please refer to the individual commit message for details.
====================

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents 1e692f09 257a525f

net/ipv4/udp.c

+5 −1
Original line number Diff line number Diff line
@@ -503,7 +503,11 @@ static inline struct sock *__udp4_lib_lookup_skb(struct sk_buff *skb, 
struct sock *udp4_lib_lookup_skb(struct sk_buff *skb,

				 __be16 sport, __be16 dport)

{

	return __udp4_lib_lookup_skb(skb, sport, dport, &udp_table);

	const struct iphdr *iph = ip_hdr(skb);



	return __udp4_lib_lookup(dev_net(skb->dev), iph->saddr, sport,

				 iph->daddr, dport, inet_iif(skb),

				 inet_sdif(skb), &udp_table, NULL);

}

EXPORT_SYMBOL_GPL(udp4_lib_lookup_skb);

net/ipv6/udp.c

+2 −2
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ struct sock *udp6_lib_lookup_skb(struct sk_buff *skb, 


	return __udp6_lib_lookup(dev_net(skb->dev), &iph->saddr, sport,

				 &iph->daddr, dport, inet6_iif(skb),

				 inet6_sdif(skb), &udp_table, skb);

				 inet6_sdif(skb), &udp_table, NULL);

}

EXPORT_SYMBOL_GPL(udp6_lib_lookup_skb);
@@ -515,7 +515,7 @@ int __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
	struct net *net = dev_net(skb->dev);



	sk = __udp6_lib_lookup(net, daddr, uh->dest, saddr, uh->source,

			       inet6_iif(skb), inet6_sdif(skb), udptable, skb);

			       inet6_iif(skb), inet6_sdif(skb), udptable, NULL);

	if (!sk) {

		/* No socket for error: try tunnels before discarding */

		sk = ERR_PTR(-ENOENT);

CRA Git | Maintained and supported by SUSTech CRA and CCSE