Peter Dawson 0e9a709560 ip6_tunnel, ip6_gre: fix setting of DSCP on encapsulated packets ... This fix addresses two problems in the way the DSCP field is formulated on the encapsulating header of IPv6 tunnels. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=195661 1) The IPv6 tunneling code was manipulating the DSCP field of the encapsulating packet using the 32b flowlabel. Since the flowlabel is only the lower 20b it was incorrect to assume that the upper 12b containing the DSCP and ECN fields would remain intact when formulating the encapsulating header. This fix handles the 'inherit' and 'fixed-value' DSCP cases explicitly using the extant dsfield u8 variable. 2) The use of INET_ECN_encapsulate(0, dsfield) in ip6_tnl_xmit was incorrect and resulted in the DSCP value always being set to 0. Commit 90427ef5d2 ("ipv6: fix flow labels when the traffic class is non-0") caused the regression by masking out the flowlabel which exposed the incorrect handling of the DSCP portion of the flowlabel in ip6_tunnel and ip6_gre. Fixes: 90427ef5d2 ("ipv6: fix flow labels when the traffic class is non-0") Signed-off-by: Peter Dawson <peter.a.dawson@boeing.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2017-05-26 14:54:39 -04:00
..
ila	net/ipv6/ila/ila_xlat.c: simplify a strange allocation pattern	2017-05-08 17:15:12 -07:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2017-05-03 10:11:26 -04:00
Kconfig	ipv6: sr: select DST_CACHE by default	2017-03-27 16:05:06 -07:00
Makefile	esp: Add a software GRO codepath	2017-02-15 11:04:11 +01:00
addrconf.c	ipv6: avoid dad-failures for addresses with NODAD	2017-05-15 14:31:51 -04:00
addrconf_core.c	ipv6: change ipv6_stub_impl.ipv6_dst_lookup to take net argument	2015-07-31 15:21:30 -07:00
addrlabel.c	net: rtnetlink: plumb extended ack to doit function	2017-04-17 15:35:38 -04:00
af_inet6.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-26 22:39:08 -04:00
ah6.c	IPsec: do not ignore crypto err in ah6 input	2017-01-16 12:57:48 +01:00
anycast.c	…
calipso.c	calipso: fix resource leak on calipso_genopt failure	2016-08-13 14:56:17 -07:00
datagram.c	net-timestamp: avoid use-after-free in ip_recv_error	2017-04-17 12:59:22 -04:00
esp6.c	esp: Fix misplaced spin_unlock_bh.	2017-04-24 07:56:31 +02:00
esp6_offload.c	esp4/6: Fix GSO path for non-GSO SW-crypto packets	2017-04-19 07:48:57 +02:00
exthdrs.c	ipv6: Need to export ipv6_push_frag_opts for tunneling now.	2017-05-01 15:10:20 -04:00
exthdrs_core.c	ipv6: constify the skb pointer of ipv6_find_tlv().	2016-06-27 15:06:15 -04:00
exthdrs_offload.c	ipv6: fix exthdrs offload registration in out_rt path	2015-09-02 15:31:00 -07:00
fib6_rules.c	net: flow: Add l3mdev flow update	2016-09-10 23:12:51 -07:00
fou6.c	fou: add Kconfig options for IPv6 support	2016-05-29 22:24:21 -07:00
icmp.c	net: for rate-limited ICMP replies save one atomic operation	2017-01-09 15:49:12 -05:00
inet6_connection_sock.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
inet6_hashtables.c	inet: collapse ipv4/v6 rcv_saddr_equal functions into one	2017-01-18 13:04:28 -05:00
ip6_checksum.c	ipv6: fix checksum annotation in udp6_csum_init	2016-06-14 15:26:42 -04:00
ip6_fib.c	ipv6: make ECMP route replacement less greedy	2017-03-13 12:16:17 -07:00
ip6_flowlabel.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
ip6_gre.c	ip6_tunnel, ip6_gre: fix setting of DSCP on encapsulated packets	2017-05-26 14:54:39 -04:00
ip6_icmp.c	ipv6: icmp: add a force_saddr param to icmp6_send()	2016-06-18 22:11:38 -07:00
ip6_input.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-20 10:35:33 -04:00
ip6_offload.c	ipv6: Check ip6_find_1stfragopt() return value properly.	2017-05-17 22:54:11 -04:00
ip6_offload.h	udp: Add GRO functions to UDP socket	2016-04-07 16:53:29 -04:00
ip6_output.c	ipv6: fix out of bound writes in __ip6_append_data()	2017-05-22 11:47:44 -04:00
ip6_tunnel.c	ip6_tunnel, ip6_gre: fix setting of DSCP on encapsulated packets	2017-05-26 14:54:39 -04:00
ip6_udp_tunnel.c	ip6_udp_tunnel: remove unused IPCB related codes	2016-11-02 15:18:36 -04:00
ip6_vti.c	ip6_tunnel: Allow policy-based routing through tunnels	2017-04-21 13:21:30 -04:00
ip6mr.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
ipcomp6.c	net: inet: Support UID-based routing in IP protocols.	2016-11-04 14:45:23 -04:00
ipv6_sockglue.c	net: Allow IP_MULTICAST_IF to set index to L3 slave	2016-12-30 15:24:47 -05:00
mcast.c	ipv6: add support for NETDEV_RESEND_IGMP event	2017-03-28 22:02:21 -07:00
mcast_snoop.c	net: fix wrong skb_get() usage / crash in IGMP/MLD parsing code	2015-08-13 17:08:39 -07:00
mip6.c	ktime: Get rid of ktime_equal()	2016-12-25 17:21:23 +01:00
ndisc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-26 22:39:08 -04:00
netfilter.c	net: inet: Support UID-based routing in IP protocols.	2016-11-04 14:45:23 -04:00
output_core.c	ipv6: Prevent overrun when parsing v6 header options	2017-05-17 14:55:59 -04:00
ping.c	ipv6: remove unnecessary inet6_sk check	2016-12-29 12:05:49 -05:00
proc.c	proc: Reduce cache miss in snmp6_seq_show	2016-09-30 01:50:44 -04:00
protocol.c	net: Add sysctl to toggle early demux for tcp and udp	2017-03-24 13:17:07 -07:00
raw.c	ipv4, ipv6: ensure raw socket message is big enough to hold an IP header	2017-05-04 11:02:46 -04:00
reassembly.c	ipv6: on reassembly, record frag_max_size	2016-11-03 15:41:11 -04:00
route.c	ipv6: reorder ip6_route_dev_notifier after ipv6_dev_notf	2017-05-08 17:31:24 -04:00
seg6.c	ipv6: sr: fix out-of-bounds access in SRH validation	2017-04-20 15:40:33 -04:00
seg6_hmac.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-02-07 16:29:30 -05:00
seg6_iptunnel.c	ipv6: sr: fix BUG due to headroom too small after SRH push	2017-04-17 15:33:53 -04:00
sit.c	ip_tunnel: Allow policy-based routing through tunnels	2017-04-21 13:21:31 -04:00
syncookies.c	tcp: randomize timestamps on syncookies	2017-05-05 12:00:11 -04:00
sysctl_net_ipv6.c	calipso: Add a label cache.	2016-06-27 15:06:17 -04:00
tcp_ipv6.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-05-15 15:50:49 -07:00
tcpv6_offload.c	…
tunnel6.c	ipv6: fix tunnel error handling	2015-11-03 10:52:13 -05:00
udp.c	udp: make *udp*_queue_rcv_skb() functions static	2017-05-18 10:23:33 -04:00
udp_impl.h	udp: make *udp*_queue_rcv_skb() functions static	2017-05-18 10:23:33 -04:00
udp_offload.c	ipv6: Check ip6_find_1stfragopt() return value properly.	2017-05-17 22:54:11 -04:00
udplite.c	udplite: call proper backlog handlers	2016-11-24 15:32:14 -05:00
xfrm6_input.c	esp: Add a software GRO codepath	2017-02-15 11:04:11 +01:00
xfrm6_mode_beet.c	…
xfrm6_mode_ro.c	…
xfrm6_mode_transport.c	xfrm: Add encapsulation header offsets while SKB is not encrypted	2017-04-14 10:07:39 +02:00
xfrm6_mode_tunnel.c	xfrm: Add encapsulation header offsets while SKB is not encrypted	2017-04-14 10:07:39 +02:00
xfrm6_output.c	xfrm: Add an IPsec hardware offloading API	2017-04-14 10:06:10 +02:00
xfrm6_policy.c	xfrm: policy: make policy backend const	2017-02-09 10:22:19 +01:00
xfrm6_protocol.c	xfrm: input: constify xfrm_input_afinfo	2017-02-09 10:22:17 +01:00
xfrm6_state.c	…
xfrm6_tunnel.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00