diff options
author | 2023-07-19 21:28:50 +0000 | |
---|---|---|
committer | 2023-07-20 12:34:18 -0700 | |
commit | 5ecf9d4f52ff2f1d4d44c9b68bc75688e82f13b4 (patch) | |
tree | 05188d2c1d64e0c751d5ee48a9523a631efa5a62 /include/net/tcp.h | |
parent | tcp: annotate data-races around tp->keepalive_time (diff) | |
download | linux-5ecf9d4f52ff2f1d4d44c9b68bc75688e82f13b4.tar.gz linux-5ecf9d4f52ff2f1d4d44c9b68bc75688e82f13b4.tar.bz2 linux-5ecf9d4f52ff2f1d4d44c9b68bc75688e82f13b4.zip |
tcp: annotate data-races around tp->keepalive_intvl
do_tcp_getsockopt() reads tp->keepalive_intvl 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-5-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 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 9e1c3337cdfe..2d8d58dec652 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1509,9 +1509,14 @@ void tcp_leave_memory_pressure(struct sock *sk); static inline int keepalive_intvl_when(const struct tcp_sock *tp) { struct net *net = sock_net((struct sock *)tp); + int val; + + /* Paired with WRITE_ONCE() in tcp_sock_set_keepintvl() + * and do_tcp_setsockopt(). + */ + val = READ_ONCE(tp->keepalive_intvl); - return tp->keepalive_intvl ? : - READ_ONCE(net->ipv4.sysctl_tcp_keepalive_intvl); + return val ? : READ_ONCE(net->ipv4.sysctl_tcp_keepalive_intvl); } static inline int keepalive_time_when(const struct tcp_sock *tp) |