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 5D882C001DE for ; Wed, 9 Aug 2023 11:03:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232978AbjHILDZ (ORCPT ); Wed, 9 Aug 2023 07:03:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233058AbjHILDK (ORCPT ); Wed, 9 Aug 2023 07:03:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E95B43C26 for ; Wed, 9 Aug 2023 03:54:26 -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 CC0306312B for ; Wed, 9 Aug 2023 10:54:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD41AC433C7; Wed, 9 Aug 2023 10:54:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1691578466; bh=AiKXa/KMJ93F0a4tASOyXRcAR1mYEUXmRdzxSraca6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HpyFDj8OuB4nBQ3zHLkPdQbDp7bc/+luESpMqKDsZ6a4ZJ3OarORmJGvpFzJiwgMs +mOSDI4yyE0gLNATuCUeegMjn/oLhNEdwUr2h1olPd60CA2D9Hfsl4IpQKTYIvTyOk A41aaer0mMyOrfnIXHkCmJagg+UW5zvJpFB2c/cE= 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 040/127] net: add missing READ_ONCE(sk->sk_rcvbuf) annotation Date: Wed, 9 Aug 2023 12:40:27 +0200 Message-ID: <20230809103638.000787079@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 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 04306ccdf9081..1a2ec2c4cfe26 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1628,7 +1628,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