From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C903ECAAD5 for ; Mon, 29 Aug 2022 11:26:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232115AbiH2L02 (ORCPT ); Mon, 29 Aug 2022 07:26:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231934AbiH2LZZ (ORCPT ); Mon, 29 Aug 2022 07:25:25 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B14A7674B; Mon, 29 Aug 2022 04:15:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 42AABB80EF8; Mon, 29 Aug 2022 11:15:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD2FFC433C1; Mon, 29 Aug 2022 11:15:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661771719; bh=zAw9Qz5eVTs6jKYDhTZVLZUcpJ8E6p9Z7KRjpQWeG4U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AzuMTO5eBCoc8iXR/Oj7fSrQsutQYUiUeU8RrMJfHmCU5w9aiVwy0i6N04qcGINvk eGsrDsfhdfUPE5xanw2cDGYZuEsj0wlefwd5Q9plOqR/kzMD5XP5CmJitnZgt9ZCsN EcQ5LJoTJWUfNOkhqrTOAriIIJLumP73CnVUa9Sg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kuniyuki Iwashima , "David S. Miller" , Sasha Levin Subject: [PATCH 5.19 073/158] net: Fix a data-race around sysctl_net_busy_read. Date: Mon, 29 Aug 2022 12:58:43 +0200 Message-Id: <20220829105812.078974628@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220829105808.828227973@linuxfoundation.org> References: <20220829105808.828227973@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kuniyuki Iwashima [ 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 --- 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 d672e63a5c2d4..16ab5ef749c60 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3365,7 +3365,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; -- 2.35.1