From patchwork Tue Sep 29 10:58:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 290757 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CFE8C4727C for ; Tue, 29 Sep 2020 12:41:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 186D520725 for ; Tue, 29 Sep 2020 12:41:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601383271; bh=7SEeLCj5yQrMSigHSE5afT9jiaFPEXd9v2iN4C8SSbw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dNrGycP9nIxj51JVulUqN4u3o8SaiXy3mBaxaizC3jNwVkjztUyGzzdlQz36MgaPd /pRxDFJMHyqaCpHF3z2lE62QXSNNKTr1x3p0Cg3vXZaldxdXGIn46udMkUM4NmV75c SNffRZ65jc8oAgjaAq6PLT6/puogYeMhrYeYrqkE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728455AbgI2LOL (ORCPT ); Tue, 29 Sep 2020 07:14:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:55556 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728302AbgI2LNR (ORCPT ); Tue, 29 Sep 2020 07:13:17 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DFFFB20848; Tue, 29 Sep 2020 11:13:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601377997; bh=7SEeLCj5yQrMSigHSE5afT9jiaFPEXd9v2iN4C8SSbw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iDiedx9jDoarEiYXv4nu0J+NJnM6Bx7YmPj07UKdc/XIF9EpPkMtSczxoRRMcwSFG 16gon/pcqtPwDSQHYHRRXyH2IubC+fJaskvUg6bbMhil7G1ul2xJjobT8BcVMmw2kK aRBpz32Y295/hdrT79+LHzjjgsapOFLOud9Y/yaQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Wang , Eric Dumazet , "David S. Miller" Subject: [PATCH 4.14 008/166] ip: fix tos reflection in ack and reset packets Date: Tue, 29 Sep 2020 12:58:40 +0200 Message-Id: <20200929105935.611172942@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105935.184737111@linuxfoundation.org> References: <20200929105935.184737111@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wei Wang [ Upstream commit ba9e04a7ddf4f22a10e05bf9403db6b97743c7bf ] Currently, in tcp_v4_reqsk_send_ack() and tcp_v4_send_reset(), we echo the TOS value of the received packets in the response. However, we do not want to echo the lower 2 ECN bits in accordance with RFC 3168 6.1.5 robustness principles. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Wei Wang Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv4/ip_output.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -73,6 +73,7 @@ #include #include #include +#include #include #include #include @@ -1562,7 +1563,7 @@ void ip_send_unicast_reply(struct sock * if (IS_ERR(rt)) return; - inet_sk(sk)->tos = arg->tos; + inet_sk(sk)->tos = arg->tos & ~INET_ECN_MASK; sk->sk_priority = skb->priority; sk->sk_protocol = ip_hdr(skb)->protocol;