diff options
| author | Eric Dumazet <edumazet@google.com> | 2023-07-19 21:28:53 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-07-27 08:57:05 +0200 |
| commit | 279e1cf49926aad4b15b7d5b1083bdcc390a07da (patch) | |
| tree | 06b9172f181a300d8ef587298edb0b8d03993bea | |
| parent | a2da353de8a5acbc3fdf1be52389273f57ce01e0 (diff) | |
| download | linux-stable-279e1cf49926aad4b15b7d5b1083bdcc390a07da.tar.gz linux-stable-279e1cf49926aad4b15b7d5b1083bdcc390a07da.tar.bz2 linux-stable-279e1cf49926aad4b15b7d5b1083bdcc390a07da.zip | |
tcp: annotate data-races around tp->linger2
[ Upstream commit 9df5335ca974e688389c875546e5819778a80d59 ]
do_tcp_getsockopt() reads tp->linger2 while another cpu
might change its value.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20230719212857.3943972-8-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/ipv4/tcp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 488cf4ae75fa..0ebe775bde68 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3694,11 +3694,11 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname, case TCP_LINGER2: if (val < 0) - tp->linger2 = -1; + WRITE_ONCE(tp->linger2, -1); else if (val > TCP_FIN_TIMEOUT_MAX / HZ) - tp->linger2 = TCP_FIN_TIMEOUT_MAX; + WRITE_ONCE(tp->linger2, TCP_FIN_TIMEOUT_MAX); else - tp->linger2 = val * HZ; + WRITE_ONCE(tp->linger2, val * HZ); break; case TCP_DEFER_ACCEPT: @@ -4106,7 +4106,7 @@ int do_tcp_getsockopt(struct sock *sk, int level, READ_ONCE(net->ipv4.sysctl_tcp_syn_retries); break; case TCP_LINGER2: - val = tp->linger2; + val = READ_ONCE(tp->linger2); if (val >= 0) val = (val ? : READ_ONCE(net->ipv4.sysctl_tcp_fin_timeout)) / HZ; break; |