summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKuniyuki Iwashima <kuniyu@amazon.com>2022-07-22 11:22:03 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-08-11 12:48:40 +0200
commit37ef2ea54885ffebc45fae73f04352bab0ffb367 (patch)
treefe66881f6c4defd35ca480853a197a41c71ff97f /net
parent32917d384b89836e593aa8ef795508257fd7d102 (diff)
downloadlinux-stable-37ef2ea54885ffebc45fae73f04352bab0ffb367.tar.gz
linux-stable-37ef2ea54885ffebc45fae73f04352bab0ffb367.tar.bz2
linux-stable-37ef2ea54885ffebc45fae73f04352bab0ffb367.zip
tcp: Fix a data-race around sysctl_tcp_comp_sack_nr.
[ Upstream commit 79f55473bfc8ac51bd6572929a679eeb4da22251 ] While reading sysctl_tcp_comp_sack_nr, it can be changed concurrently. Thus, we need to add READ_ONCE() to its reader. Fixes: 9c21d2fc41c0 ("tcp: add tcp_comp_sack_nr sysctl") 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_input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index b71866aba426..e1d065ea5a15 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -5239,7 +5239,7 @@ send_now:
}
if (!tcp_is_sack(tp) ||
- tp->compressed_ack >= sock_net(sk)->ipv4.sysctl_tcp_comp_sack_nr)
+ tp->compressed_ack >= READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_comp_sack_nr))
goto send_now;
if (tp->compressed_ack_rcv_nxt != tp->rcv_nxt) {