diff options
| author | David S. Miller <davem@davemloft.net> | 2022-07-20 10:14:50 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-07-20 10:14:50 +0100 |
| commit | 3b15b3e93e405828c0b38df15439d9a851468d98 (patch) | |
| tree | ff4df38955777e54a0ce553283c9a1bd9c72224b /net/ipv4/tcp_timer.c | |
| parent | ef5621758a02fe8178de9d0df414ffb79463ff86 (diff) | |
| parent | a11e5b3e7a59fde1a90b0eaeaa82320495cf8cae (diff) | |
| download | linux-3b15b3e93e405828c0b38df15439d9a851468d98.tar.gz linux-3b15b3e93e405828c0b38df15439d9a851468d98.tar.bz2 linux-3b15b3e93e405828c0b38df15439d9a851468d98.zip | |
Merge branch 'net-sysctl-races-round-4'
Kuniyuki Iwashima says:
====================
sysctl: Fix data-races around ipv4_net_table (Round 4).
This series fixes data-races around 17 knobs after fib_multipath_use_neigh
in ipv4_net_table.
tcp_fack was skipped because it's obsolete and there's no readers.
So, round 5 will start with tcp_dsack, 2 rounds left for 27 knobs.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_timer.c')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index ec5277becc6a..50bba370486e 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -578,7 +578,7 @@ out_reset_timer: * linear-timeout retransmissions into a black hole */ if (sk->sk_state == TCP_ESTABLISHED && - (tp->thin_lto || net->ipv4.sysctl_tcp_thin_linear_timeouts) && + (tp->thin_lto || READ_ONCE(net->ipv4.sysctl_tcp_thin_linear_timeouts)) && tcp_stream_is_thin(tp) && icsk->icsk_retransmits <= TCP_THIN_LINEAR_RETRIES) { icsk->icsk_backoff = 0; |