mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 15:47:36 +00:00
tcp: annotate data-races around icsk->icsk_syn_retries
[ Upstream commit3a037f0f3c
] do_tcp_getsockopt() and reqsk_timer_handler() read icsk->icsk_syn_retries 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-7-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
d27a1aa37e
commit
e639397202
2 changed files with 4 additions and 4 deletions
|
@ -1016,7 +1016,7 @@ static void reqsk_timer_handler(struct timer_list *t)
|
||||||
|
|
||||||
icsk = inet_csk(sk_listener);
|
icsk = inet_csk(sk_listener);
|
||||||
net = sock_net(sk_listener);
|
net = sock_net(sk_listener);
|
||||||
max_syn_ack_retries = icsk->icsk_syn_retries ? :
|
max_syn_ack_retries = READ_ONCE(icsk->icsk_syn_retries) ? :
|
||||||
READ_ONCE(net->ipv4.sysctl_tcp_synack_retries);
|
READ_ONCE(net->ipv4.sysctl_tcp_synack_retries);
|
||||||
/* Normally all the openreqs are young and become mature
|
/* Normally all the openreqs are young and become mature
|
||||||
* (i.e. converted to established socket) for first timeout.
|
* (i.e. converted to established socket) for first timeout.
|
||||||
|
|
|
@ -3397,7 +3397,7 @@ int tcp_sock_set_syncnt(struct sock *sk, int val)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
lock_sock(sk);
|
lock_sock(sk);
|
||||||
inet_csk(sk)->icsk_syn_retries = val;
|
WRITE_ONCE(inet_csk(sk)->icsk_syn_retries, val);
|
||||||
release_sock(sk);
|
release_sock(sk);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -3678,7 +3678,7 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname,
|
||||||
if (val < 1 || val > MAX_TCP_SYNCNT)
|
if (val < 1 || val > MAX_TCP_SYNCNT)
|
||||||
err = -EINVAL;
|
err = -EINVAL;
|
||||||
else
|
else
|
||||||
icsk->icsk_syn_retries = val;
|
WRITE_ONCE(icsk->icsk_syn_retries, val);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TCP_SAVE_SYN:
|
case TCP_SAVE_SYN:
|
||||||
|
@ -4095,7 +4095,7 @@ int do_tcp_getsockopt(struct sock *sk, int level,
|
||||||
val = keepalive_probes(tp);
|
val = keepalive_probes(tp);
|
||||||
break;
|
break;
|
||||||
case TCP_SYNCNT:
|
case TCP_SYNCNT:
|
||||||
val = icsk->icsk_syn_retries ? :
|
val = READ_ONCE(icsk->icsk_syn_retries) ? :
|
||||||
READ_ONCE(net->ipv4.sysctl_tcp_syn_retries);
|
READ_ONCE(net->ipv4.sysctl_tcp_syn_retries);
|
||||||
break;
|
break;
|
||||||
case TCP_LINGER2:
|
case TCP_LINGER2:
|
||||||
|
|
Loading…
Reference in a new issue