Received: by 2002:ac0:e350:0:0:0:0:0 with SMTP id g16csp1940289imn; Mon, 1 Aug 2022 05:50:18 -0700 (PDT) X-Google-Smtp-Source: AA6agR5Irhy2c6acl+lnhTWMM8ODcrlUG4lj2jPB218or1182kgG9vjbdu18sZGqs8ZZTFwxl9IL X-Received: by 2002:a17:90a:528e:b0:1f3:151a:5b49 with SMTP id w14-20020a17090a528e00b001f3151a5b49mr18952387pjh.75.1659358218689; Mon, 01 Aug 2022 05:50:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659358218; cv=none; d=google.com; s=arc-20160816; b=VXl92Hlb5cb4ZKqK41DXDaBL2Ng3IOo3lQNuTqx0vXNk6Ni7yTOcmYOKbstEWB7f5t bMq4GkVS61X87brPXAltLhxn6/rVS94gOIK6TNJb5v7UwY1M/SvMBt5+32t4KzU8/4lD 3QH4+3UwnQQRoCAOg8dadVgcAPIhlAEXgbpKX0xGUSafDKL4nJ1SfMJvs+Lz5GkzOwtJ Fn4q5YadbUPs6a4OY7R12S6cLWD0Gq3w8MwF0h+vdQhO1sTuyhOVr0+0YE6FGjxjF+Br amvj3qMiX14wKehjaMuBumzrr682PdZZMMk8TYZ3Qazg4CBNcG5xhDcmBvODFhHQobCQ j7eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9dhp5KL80joxRw+WkMPYFr0aYhVRrD7BfahU/BcT164=; b=RN9ewlsP84WlySuAvF6TpYOsvAPXEm0wDXcFwN2gVDi6908eDFAzOWfaKjZAhLtE4r 9NQjiY89oeYsb59f9RbUfao11czhabNQdxo1wq0u5TZN3+SQTSzQjYT1qHj+bepx103d O9HVsFl4cLjR/1HS20U1IkYiIDVClp6oK0BPgH03DXNs+CzWxLtsIxlGtpjtfOzpvN00 GCO1qB7RHXIoAM1Jkn3Sfi5jyT5Onr+rS0R5hXJmG5e7cu/wnM9bzCvtWS91u/0AM1tz 473y8yFDvkjHry5D8eZTUzw8Ul20YLew0a8SZvAXdmAAEl2VkMQrfCBfVbhoXFzCt0BJ M1uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=GKARKcSN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e1-20020a170902cf4100b0016d9bbb94f9si11897311plg.325.2022.08.01.05.50.03; Mon, 01 Aug 2022 05:50:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=GKARKcSN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234420AbiHAMQy (ORCPT + 99 others); Mon, 1 Aug 2022 08:16:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234360AbiHAMPt (ORCPT ); Mon, 1 Aug 2022 08:15:49 -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 301C17A519; Mon, 1 Aug 2022 04:58:29 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 76E7D601BD; Mon, 1 Aug 2022 11:58:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DC71C433D6; Mon, 1 Aug 2022 11:58:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1659355107; bh=o8COW7HGUbdghPKHXH+743bq+xK9nKbl1dSwaMzfLyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GKARKcSN+nb6WqmzQzB/OGywAuYhrlnbnR9XiUF6RfKu+SX68IdiTIrwHAT1vENau 8CELF4+P6WwRMdpuV54etP5ns4quZZk7XDthCwu8sU+XFAGL5ibxG8aI5seSPsZuZ5 dfLQm3o9b0QrHzxXPhEEWfFNvaj3LZtcL3GlHmWw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kuniyuki Iwashima , "David S. Miller" Subject: [PATCH 5.18 35/88] tcp: Fix data-races around sysctl_tcp_moderate_rcvbuf. Date: Mon, 1 Aug 2022 13:46:49 +0200 Message-Id: <20220801114139.634683929@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220801114138.041018499@linuxfoundation.org> References: <20220801114138.041018499@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kuniyuki Iwashima commit 780476488844e070580bfc9e3bc7832ec1cea883 upstream. While reading sysctl_tcp_moderate_rcvbuf, it can be changed concurrently. Thus, we need to add READ_ONCE() to its readers. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Kuniyuki Iwashima Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv4/tcp_input.c | 2 +- net/mptcp/protocol.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -724,7 +724,7 @@ void tcp_rcv_space_adjust(struct sock *s * */ - if (sock_net(sk)->ipv4.sysctl_tcp_moderate_rcvbuf && + if (READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_moderate_rcvbuf) && !(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) { int rcvmem, rcvbuf; u64 rcvwin, grow; --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1882,7 +1882,7 @@ static void mptcp_rcv_space_adjust(struc if (msk->rcvq_space.copied <= msk->rcvq_space.space) goto new_measure; - if (sock_net(sk)->ipv4.sysctl_tcp_moderate_rcvbuf && + if (READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_moderate_rcvbuf) && !(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) { int rcvmem, rcvbuf; u64 rcvwin, grow;