Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03c034c8 authored by Wei Wang's avatar Wei Wang Committed by Greg Kroah-Hartman
Browse files

ip: fix tos reflection in ack and reset packets 



[ 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: 1da177e4 ("Linux-2.6.12-rc2")

Signed-off-by: default avatarWei Wang <weiwan@google.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 585e2954

net/ipv4/ip_output.c

+2 −1
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
#include <net/icmp.h>

#include <net/checksum.h>

#include <net/inetpeer.h>

#include <net/inet_ecn.h>

#include <net/lwtunnel.h>

#include <linux/igmp.h>

#include <linux/netfilter_ipv4.h>
@@ -1611,7 +1612,7 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, 
	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;