diff options
| author | Eric Dumazet <edumazet@google.com> | 2023-07-19 21:28:49 +0000 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-07-20 12:34:18 -0700 |
| commit | 4164245c76ff906c9086758e1c3f87082a7f5ef5 (patch) | |
| tree | e04906fc69cbbe4246b71ab495927a7d770b66c8 /include/net/tcp.h | |
| parent | dd23c9f1e8d5c1d2e3d29393412385ccb9c7a948 (diff) | |
| download | linux-stable-4164245c76ff906c9086758e1c3f87082a7f5ef5.tar.gz linux-stable-4164245c76ff906c9086758e1c3f87082a7f5ef5.tar.bz2 linux-stable-4164245c76ff906c9086758e1c3f87082a7f5ef5.zip | |
tcp: annotate data-races around tp->keepalive_time
do_tcp_getsockopt() reads tp->keepalive_time 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-4-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/net/tcp.h')
| -rw-r--r-- | include/net/tcp.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 226bce6d1e8c..9e1c3337cdfe 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1517,9 +1517,12 @@ static inline int keepalive_intvl_when(const struct tcp_sock *tp) static inline int keepalive_time_when(const struct tcp_sock *tp) { struct net *net = sock_net((struct sock *)tp); + int val; - return tp->keepalive_time ? : - READ_ONCE(net->ipv4.sysctl_tcp_keepalive_time); + /* Paired with WRITE_ONCE() in tcp_sock_set_keepidle_locked() */ + val = READ_ONCE(tp->keepalive_time); + + return val ? : READ_ONCE(net->ipv4.sysctl_tcp_keepalive_time); } static inline int keepalive_probes(const struct tcp_sock *tp) |