diff options
author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2022-07-15 20:17:46 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-07-27 09:44:42 +0300 |
commit | 7b0084918c5f7da21dbb91ec24da7a554edd3209 (patch) | |
tree | 1b915335e71fba2b374fff2980b365fddb8b6d1d /net/ipv4/tcp.c | |
parent | cf6c06ac74879726c88fe1ec013727006cdbdd58 (diff) | |
download | linux-7b0084918c5f7da21dbb91ec24da7a554edd3209.tar.xz |
tcp: Fix data-races around sysctl_tcp_syn(ack)?_retries.
[ Upstream commit 20a3b1c0f603e8c55c3396abd12dfcfb523e4d3c ]
While reading sysctl_tcp_syn(ack)?_retries, they can be changed
concurrently. Thus, we need to add READ_ONCE() to their readers.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: 3a037f0f3c4b ("tcp: annotate data-races around icsk->icsk_syn_retries")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 80212bb0400c..fc4d560909b5 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3743,7 +3743,8 @@ static int do_tcp_getsockopt(struct sock *sk, int level, val = keepalive_probes(tp); break; case TCP_SYNCNT: - val = icsk->icsk_syn_retries ? : net->ipv4.sysctl_tcp_syn_retries; + val = icsk->icsk_syn_retries ? : + READ_ONCE(net->ipv4.sysctl_tcp_syn_retries); break; case TCP_LINGER2: val = tp->linger2; |