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 CD7CBC0015E for ; Wed, 9 Aug 2023 11:40:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234189AbjHILkG (ORCPT ); Wed, 9 Aug 2023 07:40:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234179AbjHILkF (ORCPT ); Wed, 9 Aug 2023 07:40:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 837D6173A for ; Wed, 9 Aug 2023 04:40:05 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 232076361B for ; Wed, 9 Aug 2023 11:40:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31453C433C8; Wed, 9 Aug 2023 11:40:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1691581204; bh=sAT4MrXXhCpLoXZXcpuJeXFtTCZ6fawC3gcrdoxEf8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y7oqcgEMuDCvR7A/1rBgxHuZORkioiLnD9KW/NjSKe/RSG5xw9XOYKAqXb5YYMu3O wLN3Wx4eNr9jrkI/WwUykKgP7OvgBKIVi2tTfSAYIgrUfTZ6Zhm1J9HM6Wg5OTQjxq jUZdRPSDhx0q2URjqtbepir2zPxA2TGRuKGi05/o= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , "David S. Miller" , Sasha Levin Subject: [PATCH 5.10 142/201] net: add missing data-race annotation for sk_ll_usec Date: Wed, 9 Aug 2023 12:42:24 +0200 Message-ID: <20230809103648.479153965@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230809103643.799166053@linuxfoundation.org> References: <20230809103643.799166053@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: Eric Dumazet [ Upstream commit e5f0d2dd3c2faa671711dac6d3ff3cef307bcfe3 ] In a prior commit I forgot that sk_getsockopt() reads sk->sk_ll_usec without holding a lock. Fixes: 0dbffbb5335a ("net: annotate data race around sk_ll_usec") Signed-off-by: Eric Dumazet 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 a241734b10240..98f4b4a80de42 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1547,7 +1547,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname, #ifdef CONFIG_NET_RX_BUSY_POLL case SO_BUSY_POLL: - v.val = sk->sk_ll_usec; + v.val = READ_ONCE(sk->sk_ll_usec); break; #endif -- 2.40.1