NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tcp: annotate data-races around tp->keepalive_probes

Browse source 
[ Upstream commit 6e5e1de616bf5f3df1769abc9292191dfad9110a ]

do_tcp_getsockopt() reads tp->keepalive_probes while another cpu
might change its value.

Fixes: 1da177e4c3 ("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>
This commit is contained in:
Eric Dumazet 2023-07-19 21:28:51 +00:00 • committed by Greg Kroah-Hartman
parent 161b069389
commit d27a1aa37e
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/net/tcp.h
View file

@ -1535,9 +1535,14 @@ static inline int keepalive_time_when(const struct tcp_sock *tp)
static inline int keepalive_probes(const struct tcp_sock *tp) static inline int keepalive_probes(const struct tcp_sock *tp)
{ {
struct net *net = sock_net((struct sock *)tp); struct net *net = sock_net((struct sock *)tp);
int val;
return tp->keepalive_probes ? : /* Paired with WRITE_ONCE() in tcp_sock_set_keepcnt()
READ_ONCE(net->ipv4.sysctl_tcp_keepalive_probes); * and do_tcp_setsockopt().
*/
val = READ_ONCE(tp->keepalive_probes);
return val ? : READ_ONCE(net->ipv4.sysctl_tcp_keepalive_probes);
} }
static inline u32 keepalive_time_elapsed(const struct tcp_sock *tp) static inline u32 keepalive_time_elapsed(const struct tcp_sock *tp)

5
net/ipv4/tcp.c
View file

@ -3463,7 +3463,8 @@ int tcp_sock_set_keepcnt(struct sock *sk, int val)
return -EINVAL; return -EINVAL;
lock_sock(sk); lock_sock(sk);
tcp_sk(sk)->keepalive_probes = val; /* Paired with READ_ONCE() in keepalive_probes() */
WRITE_ONCE(tcp_sk(sk)->keepalive_probes, val);
release_sock(sk); release_sock(sk);
return 0; return 0;
} }
@ -3671,7 +3672,7 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname,
if (val < 1 || val > MAX_TCP_KEEPCNT) if (val < 1 || val > MAX_TCP_KEEPCNT)
err = -EINVAL; err = -EINVAL;
else else
tp->keepalive_probes = val; WRITE_ONCE(tp->keepalive_probes, val);
break; break;
case TCP_SYNCNT: case TCP_SYNCNT:
if (val < 1 || val > MAX_TCP_SYNCNT) if (val < 1 || val > MAX_TCP_SYNCNT)