Received: by 2002:ac0:e34a:0:0:0:0:0 with SMTP id g10csp485553imn; Wed, 27 Jul 2022 11:31:22 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uqWTbS4skNvR79mwH5L7wCwnQf6BTa/Da0fqxS+QHNXX6T7nCOW9jiIqXoJ3Uvigqfye4W X-Received: by 2002:a17:907:2bcc:b0:72b:3391:59fd with SMTP id gv12-20020a1709072bcc00b0072b339159fdmr18965825ejc.509.1658946681751; Wed, 27 Jul 2022 11:31:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658946681; cv=none; d=google.com; s=arc-20160816; b=RW73s4jq/mU8FnOpS3eKHG8g1NubeUJ0EFhgyAUj0v63nXQYVG0IwdL606jc+05Erm o0T2eP8CPzXOPEnL//dbaNO+O7r8LdEHUtIimnwdaMddjTCtkap2rzEB7c/KrmHWd9Vl N9NRDO7TVMTaLd0SWHDiXKsiaxsO6MR8awQUqzNgrf5QTY/utsFrUzp4jJuApl2sykIr oSHnqZW3FgEkrd23O/ssw6DeYZrNMRVARmZYzQFS++FH/alVSkE3GKLEbXt+FmsRhWWF P+f2CfmGCKZuDp5xJ7cWhP8CWzlGUuLWQKkYhk7gWHyuVG9qL4uph77PIFcEFj0yVbWv xfuQ== 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=PFdMBUSjHyfLH5roBGf05vpFR+Vy4GhRT11uLMkpL88=; b=tdubaom6oUL3nazUHpQCFmA93GsYYtJYluWpTcWP7caxj4xtOJcyYmXPWAjykZNus6 9fDbx4D6fGoHv8v0SDpc9vUxGCcn/ZNvapcQ5E108dijtrvMZCwrf4dbdhrmFnY6J607 O4b3VqfIEmwDlgDKijBzNAvI0CaHxzfteK07CxBWmRVNxLdpQRLnnRZR7YUFoL+5Kj+S elRqfKl8gPXbbBsExZxDePSaXj76XaiF4KgKrlqUvi7xri+IPKiufGtAPAOV3a56kRll WjDJ76VSkUmitP01cLexO9eItGBggkbZmOVeXCXEVL6bpUW7uGf3xR/PIdogBRqmBH8Z 1uiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=piE3Fj4u; 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 i7-20020a1709063c4700b0072f1f3ec581si16365552ejg.264.2022.07.27.11.30.56; Wed, 27 Jul 2022 11:31:21 -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=piE3Fj4u; 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 S240773AbiG0QzJ (ORCPT + 99 others); Wed, 27 Jul 2022 12:55:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240878AbiG0Qwr (ORCPT ); Wed, 27 Jul 2022 12:52:47 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DDFC4F195; Wed, 27 Jul 2022 09:35:02 -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 07CBB61A8E; Wed, 27 Jul 2022 16:35:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D61DC433C1; Wed, 27 Jul 2022 16:35:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1658939701; bh=N82dgvAglJ4M4Ksvsddt8SaTUuvmWw/6BGAlwdbH6co=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=piE3Fj4uWU1vrTqAXC1HYb1pZftTbnm6g5PjyY9vyTe4m8upVJfux/KkrL/jRB/XQ YtA+WhxCNzJ5FTX9NQj8gln4S00dCpAnSlpjaf7Ucg0sRwtoxfWPGRATkQ/YUxQ/9S chjzGdxdV5wgZTq8MSdezNbFeyrIaMoP8jeUXopg= 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.10 073/105] tcp: Fix a data-race around sysctl_tcp_retrans_collapse. Date: Wed, 27 Jul 2022 18:10:59 +0200 Message-Id: <20220727161014.986231914@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220727161012.056867467@linuxfoundation.org> References: <20220727161012.056867467@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 1a63cb91f0c2fcdeced6d6edee8d1d886583d139 ] While reading sysctl_tcp_retrans_collapse, it can be changed concurrently. Thus, we need to add READ_ONCE() to its reader. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Kuniyuki Iwashima Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ipv4/tcp_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index ef64ee4c902a..9b67c61576e4 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -3100,7 +3100,7 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *to, struct sk_buff *skb = to, *tmp; bool first = true; - if (!sock_net(sk)->ipv4.sysctl_tcp_retrans_collapse) + if (!READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_retrans_collapse)) return; if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_SYN) return; -- 2.35.1