tcp: annotate data races around tp->mtu_info
Subsystems (3)
PATCH 1/1 tcp: annotate data races around tp->mtu_info
From: Eric Dumazet <[email protected]>
While tp->mtu_info is read while socket is owned, the write sides happen from err handlers (tcp_v[46]_mtu_reduced) which only own the socket spinlock.
Fixes 563d34d05786 ("tcp: dont drop MTU reduction indications")
Signed-off-by Eric Dumazet <[email protected]>
--- net/ipv4/tcp_ipv4.c | 4 ++-- net/ipv6/tcp_ipv6.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
net/ipv4/tcp_ipv4.c +2 -2
@@ -342,7 +342,7 @@ void tcp_v4_mtu_reduced(struct sock *sk)if ((1 << sk->sk_state) & (TCPF_LISTEN |TCPF_CLOSE ))return ; - mtu =tcp_sk (sk)->mtu_info; + mtu =READ_ONCE (tcp_sk (sk)->mtu_info); dst =inet_csk_update_pmtu (sk, mtu);if (!dst)return ;
@@ -546,7 +546,7 @@ int tcp_v4_err(struct sk_buff *skb, u32 info)if (sk->sk_state ==TCP_LISTEN ) goto out; - tp->mtu_info = info; +WRITE_ONCE (tp->mtu_info, info);if (!sock_owned_by_user (sk)) {tcp_v4_mtu_reduced (sk); }else {
net/ipv6/tcp_ipv6.c +2 -2
@@ -352,7 +352,7 @@ static void tcp_v6_mtu_reduced(struct sock *sk)if ((1 << sk->sk_state) & (TCPF_LISTEN |TCPF_CLOSE ))return ; - dst =inet6_csk_update_pmtu (sk,tcp_sk (sk)->mtu_info); + dst =inet6_csk_update_pmtu (sk,READ_ONCE (tcp_sk (sk)->mtu_info));if (!dst)return ;
@@ -443,7 +443,7 @@ static int tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,if (!ip6_sk_accept_pmtu (sk)) goto out; - tp->mtu_info =ntohl (info); +WRITE_ONCE (tp->mtu_info,ntohl (info));if (!sock_owned_by_user (sk))tcp_v6_mtu_reduced (sk); else if (!test_and_set_bit(TCP_MTU_REDUCED_DEFERRED,
Signature · 1 line
2.32.0.93.g670b81a890-goog
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 10 lines · On Fri, 2 Jul 2021 13:09:03 -0700 you wrote:
From: Eric Dumazet <[email protected]>
While
tp->mtu_infois read while socket is owned, the write sides happen from err handlers (tcp_v[46]_mtu_reduced) which only own the socket spinlock.Fixes 563d34d05786 ("tcp: dont drop MTU reduction indications")Signed-off-by Eric Dumazet <[email protected]>[...]
Here is the summary with links:
- [net] tcp: annotate data races around tp->mtu_info
https://git.kernel.org/netdev/net/c/561022acb1ce
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html