summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKuniyuki Iwashima <kuniyu@amazon.com>2022-08-23 10:46:52 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-09-05 10:26:31 +0200
commitd908fd060927cf23bae5b2975140c7ed81bd4013 (patch)
tree4c2a87c334917000bf9aab0738f86e1f8e792104
parentda89cab514b3ec7fdedb378617160c47fe3b60a9 (diff)
downloadlinux-d908fd060927cf23bae5b2975140c7ed81bd4013.tar.gz
linux-d908fd060927cf23bae5b2975140c7ed81bd4013.tar.bz2
linux-d908fd060927cf23bae5b2975140c7ed81bd4013.zip
net: Fix a data-race around sysctl_net_busy_read.
[ Upstream commit e59ef36f0795696ab229569c153936bfd068d21c ] While reading sysctl_net_busy_read, it can be changed concurrently. Thus, we need to add READ_ONCE() to its reader. Fixes: 2d48d67fa8cd ("net: poll/select low latency socket support") 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/core/sock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index 79f085df52ce..cd23a8e4556c 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2856,7 +2856,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
#ifdef CONFIG_NET_RX_BUSY_POLL
sk->sk_napi_id = 0;
- sk->sk_ll_usec = sysctl_net_busy_read;
+ sk->sk_ll_usec = READ_ONCE(sysctl_net_busy_read);
#endif
sk->sk_max_pacing_rate = ~0U;