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 8DA53C001B0 for ; Wed, 9 Aug 2023 11:03:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232992AbjHILDQ (ORCPT ); Wed, 9 Aug 2023 07:03:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233040AbjHILDI (ORCPT ); Wed, 9 Aug 2023 07:03:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C63203C11 for ; Wed, 9 Aug 2023 03:54:21 -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 54CF863125 for ; Wed, 9 Aug 2023 10:54:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B87AC433C7; Wed, 9 Aug 2023 10:54:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1691578460; bh=lCrw2pmBuwjI6uZyEZg59JggqsoMoyvtG8ZeARrhmWc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QbtrGuIFTfBUXlaUG0vgiEL2JG/tAi07J3wvegt4RelISqtGTA23yx8pZAxYFWq26 8LhYfuREkGfsKG04ubQocVIAnVgxR1h/zbaMfnzHiE7oUW7gUQVWMgcQGKeyOdj7H2 0RcoX7NcKNNPEkuaRadVMpAU5uhg+o9zeNokcT2U= 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 6.1 038/127] net: add missing READ_ONCE(sk->sk_rcvlowat) annotation Date: Wed, 9 Aug 2023 12:40:25 +0200 Message-ID: <20230809103637.941213082@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230809103636.615294317@linuxfoundation.org> References: <20230809103636.615294317@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 e6d12bdb435d23ff6c1890c852d85408a2f496ee ] In a prior commit, I forgot to change sk_getsockopt() when reading sk->sk_rcvlowat locklessly. Fixes: eac66402d1c3 ("net: annotate sk->sk_rcvlowat lockless reads") 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 86e88de1238b1..1b1fe67b94d4f 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1717,7 +1717,7 @@ int sk_getsockopt(struct sock *sk, int level, int optname, break; case SO_RCVLOWAT: - v.val = sk->sk_rcvlowat; + v.val = READ_ONCE(sk->sk_rcvlowat); break; case SO_SNDLOWAT: -- 2.40.1