summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuniyuki Iwashima <kuniyu@amazon.com>2022-07-20 09:50:15 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-08-11 12:48:38 +0200
commit79ea5b5190d5ba107c31f0f6490dac2c90fc9913 (patch)
treea7784fa435592add6cddbf9e4ebd3c5ff9e54ff2
parent3e39da4423c6feaab42e70cbeded4ec63f2b9ff3 (diff)
downloadlinux-stable-79ea5b5190d5ba107c31f0f6490dac2c90fc9913.tar.gz
linux-stable-79ea5b5190d5ba107c31f0f6490dac2c90fc9913.tar.bz2
linux-stable-79ea5b5190d5ba107c31f0f6490dac2c90fc9913.zip
tcp: Fix a data-race around sysctl_tcp_frto.
commit 706c6202a3589f290e1ef9be0584a8f4a3cc0507 upstream. While reading sysctl_tcp_frto, it can be changed concurrently. Thus, we need to add READ_ONCE() to its reader. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/ipv4/tcp_input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 484585171e88..0f9b91628eea 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2018,7 +2018,7 @@ void tcp_enter_loss(struct sock *sk)
* loss recovery is underway except recurring timeout(s) on
* the same SND.UNA (sec 3.2). Disable F-RTO on path MTU probing
*/
- tp->frto = net->ipv4.sysctl_tcp_frto &&
+ tp->frto = READ_ONCE(net->ipv4.sysctl_tcp_frto) &&
(new_recovery || icsk->icsk_retransmits) &&
!inet_csk(sk)->icsk_mtup.probe_size;
}