Received: by 2002:ac0:e350:0:0:0:0:0 with SMTP id g16csp1942385imn; Mon, 1 Aug 2022 05:52:56 -0700 (PDT) X-Google-Smtp-Source: AA6agR7kiJQ54Suv1eYDIcFlnG/a79V5WtZf4DWX42nGBE6dbumsA78N7xim8m6NLrgt7ZNGuDEa X-Received: by 2002:a62:ed0f:0:b0:52c:e8c2:b29e with SMTP id u15-20020a62ed0f000000b0052ce8c2b29emr12958459pfh.42.1659358376313; Mon, 01 Aug 2022 05:52:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659358376; cv=none; d=google.com; s=arc-20160816; b=chluxYpbz8g9TuXtJjV3LpRmHBiz5a84TMn8/Mo+NU526UB9gEHD0Oie+mZl3twHXK B+g+dm5CiURGo6jlcOyTcrP9BTFUE0KIxyVcfRf2wU1J6iR12KlXmMv1fZsJJNLTH31A elvD3Y3PelHb4hUAxkTxMSKwB6IypboH9vSORwIqsTKVmzXtR0emJoH5CxOUxKpq2IuR wpIGVI/dN6UUP89MmFq6MEVE1S7PZaje9In5uMPuCqqwIo/SfwdryLJWgDGh6OE0Tyfm BDvFRP9mSCqJTYs/MGdO8OvuvkE0gXGopaEEWc7gzK7R0Wsz0gGAb50QdfgNcHlJXkbb nNzQ== 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=2Sq+H9rh+WsxS7nBOHMhmVxZrUQvuM6Pa6i8AKMrE4E=; b=l8ZuPFRwA0e6JTqfyoXYY+pbtxpRIKnPqJ8eSkQC5ENfB4DGFgVkgiVMVxYuCs2WX0 QEfvrXGdCjhJfiR44nNHbx1cEWL2m/KFYwqYg18txJE8sXgHvmYvj4wEIz9UFbhaklIZ zXf/IpMHUWkPDFRZB7NGe3Dr0eKxtdCD19k7Vo4nEDBL1n1bj8r75WXfKFo3nP17uVKE mBVBvTvhZoIPYcHvGoWF3jfKAcn1wA0eZDLFCpjx9BKqu3Pxq6z3GEHkQGqJp0yZ/pXu 8AfLg7VySyenFFGCCrd5W1odPMiV+bwY2tKhEDCRQCISXN/r1nIycRkrpO4kHxVQ8xG9 x1DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="1YZzY4J/"; 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 r11-20020a170902c60b00b0016dbdf52620si11340180plr.457.2022.08.01.05.52.42; Mon, 01 Aug 2022 05:52:56 -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="1YZzY4J/"; 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 S234429AbiHAMQ6 (ORCPT + 99 others); Mon, 1 Aug 2022 08:16:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234432AbiHAMPz (ORCPT ); Mon, 1 Aug 2022 08:15:55 -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 4F39A48EAD; Mon, 1 Aug 2022 04:58:34 -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 DDD0B601BD; Mon, 1 Aug 2022 11:58:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9A9EC433C1; Mon, 1 Aug 2022 11:58:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1659355113; bh=GvhLsL9sI+LkSkyCeIUMTRPmGOnwnbk37qSVBg/HNKM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1YZzY4J/dZk5T0tEWFL1OmdP0Sx3eXhHlWtVFyjgDvrqdmLrBOjFLzj7y26WiyERY lZwIjrVn8Ygv/QyG/l7X4aPdCLvTIlRREIlkGuoI/PyGCLWFp3lOagX2zFIMWzd8gm zeKo3DnCylKDQvVXCM3XT0wCTJUwTACPBR2jBuPc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kuniyuki Iwashima , "David S. Miller" , Sasha Levin Subject: [PATCH 5.18 60/88] tcp: Fix a data-race around sysctl_tcp_comp_sack_delay_ns. Date: Mon, 1 Aug 2022 13:47:14 +0200 Message-Id: <20220801114140.799477571@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 [ Upstream commit 4866b2b0f7672b6d760c4b8ece6fb56f965dcc8a ] While reading sysctl_tcp_comp_sack_delay_ns, it can be changed concurrently. Thus, we need to add READ_ONCE() to its reader. Fixes: 6d82aa242092 ("tcp: add tcp_comp_sack_delay_ns sysctl") Signed-off-by: Kuniyuki Iwashima Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ipv4/tcp_input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index f09b1321a960..3591a25a8631 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5546,7 +5546,8 @@ static void __tcp_ack_snd_check(struct sock *sk, int ofo_possible) if (tp->srtt_us && tp->srtt_us < rtt) rtt = tp->srtt_us; - delay = min_t(unsigned long, sock_net(sk)->ipv4.sysctl_tcp_comp_sack_delay_ns, + delay = min_t(unsigned long, + READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_comp_sack_delay_ns), rtt * (NSEC_PER_USEC >> 3)/20); sock_hold(sk); hrtimer_start_range_ns(&tp->compressed_ack_timer, ns_to_ktime(delay), -- 2.35.1