From 8e6b092e23bfae0b8f1265f117f6c47646c35f1d Mon Sep 17 00:00:00 2001 From: Kuniyuki Iwashima Date: Fri, 2 Dec 2022 12:00:41 +0800 Subject: [PATCH] net: Fix a data-race around sysctl_net_busy_read. stable inclusion from stable-v5.10.140 commit 410c88314ce351c9c77ec68da1d37bd91ddd76a2 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I63FTT Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=410c88314ce351c9c77ec68da1d37bd91ddd76a2 -------------------------------- [ 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 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Zheng Zengkai Reviewed-by: Wei Li --- net/core/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/sock.c b/net/core/sock.c index aa7900c91bdf..0609cda49612 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3031,7 +3031,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 = ~0UL; -- GitLab