summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuniyuki Iwashima <kuniyu@amazon.com>2022-07-20 09:50:14 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-08-11 12:48:38 +0200
commit3e39da4423c6feaab42e70cbeded4ec63f2b9ff3 (patch)
treefb6652339930bcfc9687d184f9b1bf55d3be1c00
parent4b4d0f7d204eca946881d7233b131cec0b00e889 (diff)
downloadlinux-stable-3e39da4423c6feaab42e70cbeded4ec63f2b9ff3.tar.gz
linux-stable-3e39da4423c6feaab42e70cbeded4ec63f2b9ff3.tar.bz2
linux-stable-3e39da4423c6feaab42e70cbeded4ec63f2b9ff3.zip
tcp: Fix a data-race around sysctl_tcp_adv_win_scale.
commit 36eeee75ef0157e42fb6593dcc65daab289b559e upstream. While reading sysctl_tcp_adv_win_scale, 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--include/net/tcp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index d28fa78dedb5..436ad4bc9d4c 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1355,7 +1355,7 @@ void tcp_select_initial_window(const struct sock *sk, int __space,
static inline int tcp_win_from_space(const struct sock *sk, int space)
{
- int tcp_adv_win_scale = sock_net(sk)->ipv4.sysctl_tcp_adv_win_scale;
+ int tcp_adv_win_scale = READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_adv_win_scale);
return tcp_adv_win_scale <= 0 ?
(space>>(-tcp_adv_win_scale)) :