summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuniyuki Iwashima <kuniyu@amazon.com>2022-07-20 09:50:25 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-08-03 12:03:49 +0200
commit6f446677ebb34665a631ad408155f6cf1bd02b09 (patch)
tree582996f28fb65e33d315cf7af319b21fb343413d
parentbd07f2e70a4ba1b343e8e1efea4136411b1b114d (diff)
downloadlinux-stable-6f446677ebb34665a631ad408155f6cf1bd02b09.tar.gz
linux-stable-6f446677ebb34665a631ad408155f6cf1bd02b09.tar.bz2
linux-stable-6f446677ebb34665a631ad408155f6cf1bd02b09.zip
tcp: Fix a data-race around sysctl_tcp_autocorking.
[ Upstream commit 85225e6f0a76e6745bc841c9f25169c509b573d8 ] While reading sysctl_tcp_autocorking, it can be changed concurrently. Thus, we need to add READ_ONCE() to its reader. Fixes: f54b311142a9 ("tcp: auto corking") 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 1abdb8712655..7ba9059c263a 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -694,7 +694,7 @@ static bool tcp_should_autocork(struct sock *sk, struct sk_buff *skb,
int size_goal)
{
return skb->len < size_goal &&
- sock_net(sk)->ipv4.sysctl_tcp_autocorking &&
+ READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_autocorking) &&
!tcp_rtx_queue_empty(sk) &&
refcount_read(&sk->sk_wmem_alloc) > skb->truesize;
}