diff mbox series

[5.4,13/43] ip: fix tos reflection in ack and reset packets

Message ID	20200925124725.549029038@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=ikAt=DC=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Wei Wang <weiwan@google.com>, Eric Dumazet <edumazet@google.com>, "David S. Miller" <davem@davemloft.net> Subject: [PATCH 5.4 13/43] ip: fix tos reflection in ack and reset packets Date: Fri, 25 Sep 2020 14:48:25 +0200 Message-Id: <20200925124725.549029038@linuxfoundation.org> In-Reply-To: <20200925124723.575329814@linuxfoundation.org> References: <20200925124723.575329814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.4,02/43] ibmvnic fix NULL tx_pools and rx_tools issue at do_reset [5.4,03/43] ibmvnic: add missing parenthesis in do_reset() [5.4,04/43] kprobes: fix kill kprobe which has been marked as gone [5.4,05/43] mm/thp: fix __split_huge_pmd_locked() for migration PMD [5.4,06/43] act_ife: load meta modules before tcf_idr_check_alloc() [5.4,07/43] bnxt_en: Avoid sending firmware messages when AER error is detected. [5.4,08/43] bnxt_en: Fix NULL ptr dereference crash in bnxt_fw_reset_task() [5.4,09/43] cxgb4: fix memory leak during module unload [5.4,10/43] cxgb4: Fix offset when clearing filter byte counters [5.4,11/43] geneve: add transport ports in route lookup for geneve [5.4,12/43] hdlc_ppp: add range checks in ppp_cp_parse_cr() [5.4,13/43] ip: fix tos reflection in ack and reset packets [5.4,14/43] ipv4: Initialize flowi4_multipath_hash in data path [5.4,15/43] ipv4: Update exception handling for multipath routes via same device [5.4,16/43] ipv6: avoid lockdep issue in fib6_del() [5.4,17/43] net: bridge: br_vlan_get_pvid_rcu() should dereference the VLAN group under RCU [5.4,18/43] net: DCB: Validate DCB_ATTR_DCB_BUFFER argument [5.4,19/43] net: dsa: rtl8366: Properly clear member config [5.4,20/43] net: Fix bridge enslavement failure [5.4,21/43] net: ipv6: fix kconfig dependency warning for IPV6_SEG6_HMAC [5.4,22/43] net/mlx5: Fix FTE cleanup [5.4,23/43] net: sch_generic: aviod concurrent reset and enqueue op for lockless qdisc [5.4,24/43] net: sctp: Fix IPv6 ancestor_size calc in sctp_copy_descendant [5.4,25/43] nfp: use correct define to return NONE fec [5.4,26/43] taprio: Fix allowing too small intervals [5.4,27/43] tipc: Fix memory leak in tipc_group_create_member() [5.4,28/43] tipc: fix shutdown() of connection oriented socket [5.4,29/43] tipc: use skb_unshare() instead in tipc_buf_append() [5.4,30/43] net/mlx5e: Enable adding peer miss rules only if merged eswitch is supported [5.4,31/43] net/mlx5e: TLS, Do not expose FPGA TLS counter if not supported [5.4,32/43] bnxt_en: return proper error codes in bnxt_show_temp [5.4,33/43] bnxt_en: Protect bnxt_set_eee() and bnxt_set_pauseparam() with mutex. [5.4,34/43] net: lantiq: Wake TX queue again [5.4,35/43] net: lantiq: use netif_tx_napi_add() for TX NAPI [5.4,36/43] net: lantiq: Use napi_complete_done() [5.4,37/43] net: lantiq: Disable IRQs only if NAPI gets scheduled [5.4,38/43] net: phy: Avoid NPD upon phy_detach() when driver is unbound [5.4,39/43] net: phy: Do not warn in phy_stop() on PHY_DOWN [5.4,40/43] net: qrtr: check skb_put_padto() return value [5.4,41/43] net: add __must_check to skb_put_padto() [5.4,42/43] mm: memcg: fix memcg reclaim soft lockup [5.4,43/43] iommu/amd: Use cmpxchg_double() when updating 128-bit IRTE

Commit Message

gregkh@linuxfoundation.org Sept. 25, 2020, 12:48 p.m. UTC

From: Wei Wang <weiwan@google.com>

[ 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 <weiwan@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/ipv4/ip_output.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff mbox series

Patch

--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -74,6 +74,7 @@ 
 #include <net/icmp.h>
 #include <net/checksum.h>
 #include <net/inetpeer.h>
+#include <net/inet_ecn.h>
 #include <net/lwtunnel.h>
 #include <linux/bpf-cgroup.h>
 #include <linux/igmp.h>
@@ -1699,7 +1700,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;