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 45C5DEB64DD for ; Wed, 9 Aug 2023 10:46:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231848AbjHIKqG (ORCPT ); Wed, 9 Aug 2023 06:46:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232060AbjHIKqE (ORCPT ); Wed, 9 Aug 2023 06:46:04 -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 6A5FC1FD8 for ; Wed, 9 Aug 2023 03:46:03 -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 0047763118 for ; Wed, 9 Aug 2023 10:46:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EF49C433C8; Wed, 9 Aug 2023 10:46:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1691577962; bh=WxVAyr/b4Gr6p7QN1M4qGkQb40nfA+WCxuQltzZRve4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IdXIKGjPDVrN/G2F3rlwDO/rv3x+/39dajX2EXnEtCx5eVbmwmClP0k2b0dejNfs5 oQC3SlYb/Ty+bWZ5QELYsX2CM6aNl1NhTJr9pIgSrQzcKmsn/jwnCtALbJvT4RbQhh mG/lh5rtApKwgiitXDmRoH+NynQyuNIOjalBQzYA= 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.4 056/165] net: add missing READ_ONCE(sk->sk_rcvbuf) annotation Date: Wed, 9 Aug 2023 12:39:47 +0200 Message-ID: <20230809103644.650329245@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230809103642.720851262@linuxfoundation.org> References: <20230809103642.720851262@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 b4b553253091cafe9ec38994acf42795e073bef5 ] In a prior commit, I forgot to change sk_getsockopt() when reading sk->sk_rcvbuf locklessly. Fixes: ebb3b78db7bf ("tcp: annotate sk->sk_rcvbuf 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 c5dfeb6d4fec6..8c69610753ec2 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1630,7 +1630,7 @@ int sk_getsockopt(struct sock *sk, int level, int optname, break; case SO_RCVBUF: - v.val = sk->sk_rcvbuf; + v.val = READ_ONCE(sk->sk_rcvbuf); break; case SO_REUSEADDR: -- 2.40.1