Skip to content

Commit ae488c7

Browse files
edumazetkuba-moo
authored andcommitted
tcp: annotate data-races around rskq_defer_accept
do_tcp_getsockopt() reads rskq_defer_accept while another cpu might change its value. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Eric Dumazet <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 9df5335 commit ae488c7

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

net/ipv4/tcp.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3594,9 +3594,9 @@ int do_tcp_setsockopt(struct sock *sk, int level, int optname,
35943594

35953595
case TCP_DEFER_ACCEPT:
35963596
/* Translate value in seconds to number of retransmits */
3597-
icsk->icsk_accept_queue.rskq_defer_accept =
3598-
secs_to_retrans(val, TCP_TIMEOUT_INIT / HZ,
3599-
TCP_RTO_MAX / HZ);
3597+
WRITE_ONCE(icsk->icsk_accept_queue.rskq_defer_accept,
3598+
secs_to_retrans(val, TCP_TIMEOUT_INIT / HZ,
3599+
TCP_RTO_MAX / HZ));
36003600
break;
36013601

36023602
case TCP_WINDOW_CLAMP:
@@ -4002,8 +4002,9 @@ int do_tcp_getsockopt(struct sock *sk, int level,
40024002
val = (val ? : READ_ONCE(net->ipv4.sysctl_tcp_fin_timeout)) / HZ;
40034003
break;
40044004
case TCP_DEFER_ACCEPT:
4005-
val = retrans_to_secs(icsk->icsk_accept_queue.rskq_defer_accept,
4006-
TCP_TIMEOUT_INIT / HZ, TCP_RTO_MAX / HZ);
4005+
val = READ_ONCE(icsk->icsk_accept_queue.rskq_defer_accept);
4006+
val = retrans_to_secs(val, TCP_TIMEOUT_INIT / HZ,
4007+
TCP_RTO_MAX / HZ);
40074008
break;
40084009
case TCP_WINDOW_CLAMP:
40094010
val = tp->window_clamp;

0 commit comments

Comments
 (0)