summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuniyuki Iwashima <kuniyu@amazon.com>2022-07-20 09:50:22 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-08-03 12:03:48 +0200
commit922ca9fd221ba4b74abeee94675dd04d1307b8dd (patch)
treed0890ceb5f7f2dfc01040bc812ef5f224c6b2703
parent777d18e65d0901d5cb05c0497e359192279f0498 (diff)
downloadlinux-stable-922ca9fd221ba4b74abeee94675dd04d1307b8dd.tar.gz
linux-stable-922ca9fd221ba4b74abeee94675dd04d1307b8dd.tar.bz2
linux-stable-922ca9fd221ba4b74abeee94675dd04d1307b8dd.zip
tcp: Fix a data-race around sysctl_tcp_min_tso_segs.
[ Upstream commit e0bb4ab9dfddd872622239f49fb2bd403b70853b ] While reading sysctl_tcp_min_tso_segs, it can be changed concurrently. Thus, we need to add READ_ONCE() to its reader. Fixes: 95bd09eb2750 ("tcp: TSO packets automatic sizing") Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--net/ipv4/tcp_output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 4389ad7e4c8c..51f31311fdb6 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1986,7 +1986,7 @@ static u32 tcp_tso_segs(struct sock *sk, unsigned int mss_now)
min_tso = ca_ops->min_tso_segs ?
ca_ops->min_tso_segs(sk) :
- sock_net(sk)->ipv4.sysctl_tcp_min_tso_segs;
+ READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_min_tso_segs);
tso_segs = tcp_tso_autosize(sk, mss_now, min_tso);
return min_t(u32, tso_segs, sk->sk_gso_max_segs);