Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcp: annotate data-races around icsk->icsk_user_timeout

Browse Source 
This field can be read locklessly from do_tcp_getsockopt()

Fixes: dca43c75e7 ("tcp: Add TCP_USER_TIMEOUT socket option.")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20230719212857.3943972-11-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Eric Dumazet 2023-07-19 21:28:56 +00:00 committed by Jakub Kicinski
parent 1aeb87bc14
commit 26023e91e1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv4/tcp.c
View File

@ -3300,7 +3300,7 @@ EXPORT_SYMBOL(tcp_sock_set_syncnt);
void tcp_sock_set_user_timeout(struct sock *sk, u32 val) void tcp_sock_set_user_timeout(struct sock *sk, u32 val)
{ {
lock_sock(sk); lock_sock(sk);
inet_csk(sk)->icsk_user_timeout = val; WRITE_ONCE(inet_csk(sk)->icsk_user_timeout, val);
release_sock(sk); release_sock(sk);
} }
EXPORT_SYMBOL(tcp_sock_set_user_timeout); EXPORT_SYMBOL(tcp_sock_set_user_timeout);
@ -3620,7 +3620,7 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname,
if (val < 0) if (val < 0)
err = -EINVAL; err = -EINVAL;
else else
icsk->icsk_user_timeout = val; WRITE_ONCE(icsk->icsk_user_timeout, val);
break; break;
case TCP_FASTOPEN: case TCP_FASTOPEN:
@ -4141,7 +4141,7 @@ int do_tcp_getsockopt(struct sock *sk, int level,
break; break;
case TCP_USER_TIMEOUT: case TCP_USER_TIMEOUT:
val = icsk->icsk_user_timeout; val = READ_ONCE(icsk->icsk_user_timeout);
break; break;
case TCP_FASTOPEN: case TCP_FASTOPEN: