diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2022-07-18 10:26:49 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-29 17:10:34 +0200 |
| commit | d4a90eb32681c79a140ff2600b52fce291cf4e91 (patch) | |
| tree | b089bf8b7df23bb17fed9cdaa13e5d48b7ad7259 /net | |
| parent | 3b26e11b07a09b31247688bec61e2925d4a571b6 (diff) | |
| download | linux-stable-d4a90eb32681c79a140ff2600b52fce291cf4e91.tar.gz linux-stable-d4a90eb32681c79a140ff2600b52fce291cf4e91.tar.bz2 linux-stable-d4a90eb32681c79a140ff2600b52fce291cf4e91.zip | |
tcp: Fix a data-race around sysctl_tcp_retrans_collapse.
[ Upstream commit 1a63cb91f0c2fcdeced6d6edee8d1d886583d139 ]
While reading sysctl_tcp_retrans_collapse, 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: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 3b416dfb8aff..13d9e8570ce5 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -2816,7 +2816,7 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *to, struct sk_buff *skb = to, *tmp; bool first = true; - if (!sock_net(sk)->ipv4.sysctl_tcp_retrans_collapse) + if (!READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_retrans_collapse)) return; if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_SYN) return; |