inet: annotate data-races around isk->inet_num
Subsystems (4)
PATCH 1/1 inet: annotate data-races around isk->inet_num
UDP/TCP lookups are using RCU, thus isk->inet_num accesses should use READ_ONCE() and WRITE_ONCE() where needed.
Fixes 3ab5aee7fe84 ("net: Convert TCP & DCCP hash tables to use RCU / hlist_nulls")
Signed-off-by Eric Dumazet <[email protected]>
--- include/net/inet6_hashtables.h | 2 +- include/net/inet_hashtables.h | 2 +- include/net/ip.h | 2 +- net/ipv4/inet_hashtables.c | 8 ++++---- net/ipv4/tcp_diag.c | 2 +- net/ipv6/inet6_hashtables.c | 3 ++- 6 files changed, 10 insertions(+), 9 deletions(-)
include/net/inet6_hashtables.h +1 -1
@@ -175,7 +175,7 @@ static inline bool inet6_match(const struct net *net, const struct sock *sk, {if (!net_eq (sock_net (sk), net) || sk->sk_family !=AF_INET6 || - sk->sk_portpair != ports || +READ_ONCE (sk->sk_portpair) != ports || !ipv6_addr_equal (&sk->sk_v6_daddr, saddr) || !ipv6_addr_equal (&sk->sk_v6_rcv_saddr, daddr))return false;
include/net/inet_hashtables.h +1 -1
@@ -345,7 +345,7 @@ static inline bool inet_match(const struct net *net, const struct sock *sk, int dif, int sdif) {if (!net_eq (sock_net (sk), net) || - sk->sk_portpair != ports || +READ_ONCE (sk->sk_portpair) != ports || sk->sk_addrpair != cookie)return false;
include/net/ip.h +1 -1
@@ -101,7 +101,7 @@ static inline void ipcm_init_sk(struct ipcm_cookie *ipcm, ipcm->oif =READ_ONCE (inet->sk.sk_bound_dev_if); ipcm->addr = inet->inet_saddr; - ipcm->protocol = inet->inet_num; + ipcm->protocol =READ_ONCE (inet->inet_num); }#define IPCB (skb) ((struct inet_skb_parm*)((skb)->cb))
net/ipv4/inet_hashtables.c +4 -4
@@ -200,7 +200,7 @@ static bool inet_bind2_bucket_addr_match(const struct inet_bind2_bucket *tb2,void inet_bind_hash (struct sock *sk,struct inet_bind_bucket *tb,struct inet_bind2_bucket *tb2,unsigned short port) { -inet_sk (sk)->inet_num = port; +WRITE_ONCE (inet_sk (sk)->inet_num, port);inet_csk (sk)->icsk_bind_hash = tb;inet_csk (sk)->icsk_bind2_hash = tb2;sk_add_bind_node (sk, &tb2->owners);
@@ -224,7 +224,7 @@ static void __inet_put_port(struct sock *sk)spin_lock (&head->lock); tb =inet_csk (sk)->icsk_bind_hash;inet_csk (sk)->icsk_bind_hash =NULL ; -inet_sk (sk)->inet_num =0 ; +WRITE_ONCE (inet_sk (sk)->inet_num,0 ); sk->sk_userlocks &= ~SOCK_CONNECT_BIND ;spin_lock (&head2->lock);
@@ -352,7 +352,7 @@ static inline int compute_score(struct sock *sk, const struct net *net, {int score =-1 ; -if (net_eq (sock_net (sk), net) && sk->sk_num == hnum && +if (net_eq (sock_net (sk), net) &&READ_ONCE (sk->sk_num) == hnum && !ipv6_only_sock (sk)) {if (sk->sk_rcv_saddr != daddr)return -1 ;
@@ -1206,7 +1206,7 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row, sk->sk_hash =0 ;inet_sk (sk)->inet_sport =0 ; -inet_sk (sk)->inet_num =0 ; +WRITE_ONCE (inet_sk (sk)->inet_num,0 );if (tw)inet_twsk_bind_unhash (tw, hinfo);
net/ipv4/tcp_diag.c +1 -1
@@ -509,7 +509,7 @@ static void tcp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,if (r->sdiag_family !=AF_UNSPEC && sk->sk_family != r->sdiag_family) goto next_normal; -if (r->id.idiag_sport !=htons (sk->sk_num) && +if (r->id.idiag_sport !=htons (READ_ONCE (sk->sk_num)) && r->id.idiag_sport) goto next_normal; if (r->id.idiag_dport != sk->sk_dport &&
net/ipv6/inet6_hashtables.c +2 -1
@@ -95,7 +95,8 @@ static inline int compute_score(struct sock *sk, const struct net *net, {int score =-1 ; -if (net_eq (sock_net (sk), net) &&inet_sk (sk)->inet_num == hnum && +if (net_eq (sock_net (sk), net) && +READ_ONCE (inet_sk (sk)->inet_num) == hnum && sk->sk_family ==PF_INET6 ) {if (!ipv6_addr_equal (&sk->sk_v6_rcv_saddr, daddr))return -1 ;
Signature · 1 line
2.53.0.414.gf7e9f6c205-goog
Quoted 6 lines · Eric Dumazet
UDP/TCP lookups are using RCU, thus
isk->inet_numaccesses should useREAD_ONCE()andWRITE_ONCE()where needed.Fixes 3ab5aee7fe84 ("net: Convert TCP & DCCP hash tables to use RCU / hlist_nulls")Signed-off-by Eric Dumazet <[email protected]>
Reviewed-by Kuniyuki Iwashima <[email protected]>
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 5 lines · On Wed, 25 Feb 2026 20:35:45 +0000 you wrote:
UDP/TCP lookups are using RCU, thus
isk->inet_numaccesses should useREAD_ONCE()andWRITE_ONCE()where needed.Fixes 3ab5aee7fe84 ("net: Convert TCP & DCCP hash tables to use RCU / hlist_nulls")Signed-off-by Eric Dumazet <[email protected]>
Quoted 8 lines
--- include/net/inet6_hashtables.h | 2 +- include/net/inet_hashtables.h | 2 +- include/net/ip.h | 2 +- net/ipv4/inet_hashtables.c | 8 ++++---- net/ipv4/tcp_diag.c | 2 +- net/ipv6/inet6_hashtables.c | 3 ++- 6 files changed, 10 insertions(+), 9 deletions(-)
Here is the summary with links:
- [net] inet: annotate data-races around isk->inet_num
https://git.kernel.org/netdev/net/c/29252397bcc1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html