Commit 87d973e8 authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

ipv6: udp: constify 'struct net' parameter of socket lookups 



Following helpers do not touch their 'struct net' argument.

- udp6_lib_lookup()
- __udp6_lib_lookup()

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20240802134029.3748005-6-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 10b2a44c

include/net/ipv6_stubs.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ extern const struct ipv6_stub *ipv6_stub __read_mostly; 
struct ipv6_bpf_stub {

	int (*inet6_bind)(struct sock *sk, struct sockaddr *uaddr, int addr_len,

			  u32 flags);

	struct sock *(*udp6_lib_lookup)(struct net *net,

	struct sock *(*udp6_lib_lookup)(const struct net *net,

				     const struct in6_addr *saddr, __be16 sport,

				     const struct in6_addr *daddr, __be16 dport,

				     int dif, int sdif, struct udp_table *tbl,

include/net/udp.h

+2 −2
Original line number Diff line number Diff line
@@ -305,11 +305,11 @@ struct sock *__udp4_lib_lookup(const struct net *net, __be32 saddr, 
			       struct udp_table *tbl, struct sk_buff *skb);

struct sock *udp4_lib_lookup_skb(const struct sk_buff *skb,

				 __be16 sport, __be16 dport);

struct sock *udp6_lib_lookup(struct net *net,

struct sock *udp6_lib_lookup(const struct net *net,

			     const struct in6_addr *saddr, __be16 sport,

			     const struct in6_addr *daddr, __be16 dport,

			     int dif);

struct sock *__udp6_lib_lookup(struct net *net,

struct sock *__udp6_lib_lookup(const struct net *net,

			       const struct in6_addr *saddr, __be16 sport,

			       const struct in6_addr *daddr, __be16 dport,

			       int dif, int sdif, struct udp_table *tbl,

net/ipv6/udp.c

+4 −4
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ void udp_v6_rehash(struct sock *sk) 
	udp_lib_rehash(sk, new_hash);

}



static int compute_score(struct sock *sk, struct net *net,

static int compute_score(struct sock *sk, const struct net *net,

			 const struct in6_addr *saddr, __be16 sport,

			 const struct in6_addr *daddr, unsigned short hnum,

			 int dif, int sdif)
@@ -160,7 +160,7 @@ static int compute_score(struct sock *sk, struct net *net, 
}



/* called with rcu_read_lock() */

static struct sock *udp6_lib_lookup2(struct net *net,

static struct sock *udp6_lib_lookup2(const struct net *net,

		const struct in6_addr *saddr, __be16 sport,

		const struct in6_addr *daddr, unsigned int hnum,

		int dif, int sdif, struct udp_hslot *hslot2,
@@ -217,7 +217,7 @@ static struct sock *udp6_lib_lookup2(struct net *net, 
}



/* rcu_read_lock() must be held */

struct sock *__udp6_lib_lookup(struct net *net,

struct sock *__udp6_lib_lookup(const struct net *net,

			       const struct in6_addr *saddr, __be16 sport,

			       const struct in6_addr *daddr, __be16 dport,

			       int dif, int sdif, struct udp_table *udptable,
@@ -300,7 +300,7 @@ struct sock *udp6_lib_lookup_skb(const struct sk_buff *skb, 
 * Does increment socket refcount.

 */

#if IS_ENABLED(CONFIG_NF_TPROXY_IPV6) || IS_ENABLED(CONFIG_NF_SOCKET_IPV6)

struct sock *udp6_lib_lookup(struct net *net, const struct in6_addr *saddr, __be16 sport,

struct sock *udp6_lib_lookup(const struct net *net, const struct in6_addr *saddr, __be16 sport,

			     const struct in6_addr *daddr, __be16 dport, int dif)

{

	struct sock *sk;