diff options
| author | Eric Dumazet <edumazet@google.com> | 2023-07-19 21:28:51 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-07-27 08:57:04 +0200 |
| commit | 80cd1842e2da9a3383733d968913921e760558cc (patch) | |
| tree | 92ad316e6e8ace36e909d1894f0fa77b3e603dbe /include | |
| parent | 7416761d5b1c79efcb5b1ce47af28df297d4188d (diff) | |
| download | linux-stable-80cd1842e2da9a3383733d968913921e760558cc.tar.gz linux-stable-80cd1842e2da9a3383733d968913921e760558cc.tar.bz2 linux-stable-80cd1842e2da9a3383733d968913921e760558cc.zip | |
tcp: annotate data-races around tp->keepalive_probes
[ Upstream commit 6e5e1de616bf5f3df1769abc9292191dfad9110a ]
do_tcp_getsockopt() reads tp->keepalive_probes 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-6-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/tcp.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 45d50a40795d..f5c20afab628 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1538,9 +1538,14 @@ static inline int keepalive_time_when(const struct tcp_sock *tp) static inline int keepalive_probes(const struct tcp_sock *tp) { struct net *net = sock_net((struct sock *)tp); + int val; + + /* Paired with WRITE_ONCE() in tcp_sock_set_keepcnt() + * and do_tcp_setsockopt(). + */ + val = READ_ONCE(tp->keepalive_probes); - return tp->keepalive_probes ? : - READ_ONCE(net->ipv4.sysctl_tcp_keepalive_probes); + return val ? : READ_ONCE(net->ipv4.sysctl_tcp_keepalive_probes); } static inline u32 keepalive_time_elapsed(const struct tcp_sock *tp) |