android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: annotate data-races around icsk->icsk_user_timeout

Browse Source 
[ Upstream commit 26023e91e12c68669db416b97234328a03d8e499 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Eric Dumazet 2023-07-19 21:28:56 +00:00 committed by Greg Kroah-Hartman
parent 918a1beb0a
commit 01a1563a09
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

@ -3406,7 +3406,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);
@ -3726,7 +3726,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:
@ -4243,7 +4243,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: