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 X-Spam-Level: X-Spam-Status: No, score=-10.9 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=ham 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 DE4ABC4363D for ; Fri, 25 Sep 2020 12:50:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9897522B2D for ; Fri, 25 Sep 2020 12:50:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601038205; bh=O+NnOn5THC5Eih2blLWpVzsTAdm/XIrZ8FvhnuTux14=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=w0GRE/5FeY7RHsI+bE/CVQnZ3c+5S7MZgZ7xFGMqCfgXwaMLBUj3SpPl1of/vzcpe Pf9VXrpF4Gp8rttXFPIJ3OzE20tIRvKG1PIskCPsB/w3q35xXeGLIyQzciJKCXruEd trjSuk7/5TY4JwoHSnNL+xegzXMe0meLROpeLGE8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729007AbgIYMuE (ORCPT ); Fri, 25 Sep 2020 08:50:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:53858 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728991AbgIYMuC (ORCPT ); Fri, 25 Sep 2020 08:50:02 -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 55EEF21D91; Fri, 25 Sep 2020 12:50:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601038201; bh=O+NnOn5THC5Eih2blLWpVzsTAdm/XIrZ8FvhnuTux14=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jORG+ZDHnTzCMy3G7IZhIBXHlH+DLybCek3fp2qUntiJA+OO03aouc7X/IVOcyJKO fqTQigqmdTDBRyfvlTgLF5poIvLZYD41+27au+YDAYYq5XwbkVOm6JTLEyoP4LZIsW YWqnjlRW1RKD6h3SvykYpqUBR/p7xCTar1OWM26E= 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 5.8 11/56] ip: fix tos reflection in ack and reset packets Date: Fri, 25 Sep 2020 14:48:01 +0200 Message-Id: <20200925124729.508991941@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200925124727.878494124@linuxfoundation.org> References: <20200925124727.878494124@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -74,6 +74,7 @@ #include #include #include +#include #include #include #include @@ -1697,7 +1698,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_protocol = ip_hdr(skb)->protocol; sk->sk_bound_dev_if = arg->bound_dev_if;