Mark TomlinsonandDavid S. Miller 272502fcb7 gre6: Fix reception with IP6_TNL_F_RCV_DSCP_COPY ...

When receiving an IPv4 packet inside an IPv6 GRE packet, and the
IP6_TNL_F_RCV_DSCP_COPY flag is set on the tunnel, the IPv4 header would
get corrupted. This is due to the common ip6_tnl_rcv() function assuming
that the inner header is always IPv6. This patch checks the tunnel
protocol for IPv4 inner packets, but still defaults to IPv6.

Fixes: 308edfdf15 ("gre6: Cleanup GREv6 receive path, call common GRE functions")
Signed-off-by: Mark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>
Signed-off-by: David S. Miller <davem@davemloft.net>

2020-08-20 16:28:04 -07:00

..

ila

net: Add MODULE_DESCRIPTION entries to network modules

2020-06-20 21:33:57 -07:00

netfilter

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

2020-08-05 20:13:21 -07:00

addrconf_core.c

…

addrconf.c

ipv6: some fixes for ipv6_dev_find()

2020-08-18 15:58:53 -07:00

addrlabel.c

…

af_inet6.c

net: remove compat_sock_common_{get,set}sockopt

2020-07-19 18:16:40 -07:00

ah6.c

…

anycast.c

ipv6: fix memory leaks on IPV6_ADDRFORM path

2020-07-30 16:30:55 -07:00

calipso.c

netlabel: cope with NULL catmap

2020-05-12 18:12:40 -07:00

datagram.c

icmp6: support rfc 4884

2020-07-24 17:12:41 -07:00

esp6_offload.c

net: Add MODULE_DESCRIPTION entries to network modules

2020-06-20 21:33:57 -07:00

esp6.c

xfrm: esp6: fix the location of the transport header with encapsulation

2020-07-28 07:57:23 +02:00

exthdrs_core.c

…

exthdrs_offload.c

…

exthdrs.c

net: ipv6: kerneldoc fixes

2020-07-13 17:20:39 -07:00

fib6_notifier.c

…

fib6_rules.c

fib: use indirect call wrappers in the most common fib_rules_ops

2020-07-28 17:42:31 -07:00

fou6.c

net: Add MODULE_DESCRIPTION entries to network modules

2020-06-20 21:33:57 -07:00

icmp.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2020-07-11 00:46:00 -07:00

inet6_connection_sock.c

…

inet6_hashtables.c

inet6: Run SK_LOOKUP BPF program on socket lookup

2020-07-17 20:18:17 -07:00

ip6_checksum.c

…

ip6_fib.c

ipv6: fib6: avoid indirect calls from fib6_rule_lookup

2020-06-23 15:11:19 -07:00

ip6_flowlabel.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

2020-08-05 20:13:21 -07:00

ip6_gre.c

ip6_gre: fix null-ptr-deref in ip6gre_init_net()

2020-07-13 17:32:17 -07:00

ip6_icmp.c

ipv6: icmp6: avoid indirect call for icmpv6_send()

2020-06-19 13:41:59 -07:00

ip6_input.c

…

ip6_offload.c

udp: move gro declarations to net/udp.h

2020-06-23 20:10:15 -07:00

ip6_offload.h

…

ip6_output.c

net: ipv6: kerneldoc fixes

2020-07-13 17:20:39 -07:00

ip6_tunnel.c

gre6: Fix reception with IP6_TNL_F_RCV_DSCP_COPY

2020-08-20 16:28:04 -07:00

ip6_udp_tunnel.c

net: Make locking in sock_bindtoindex optional

2020-06-01 14:57:14 -07:00

ip6_vti.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

2020-07-30 14:39:31 -07:00

ip6mr.c

net/ipv6: switch ip6_mroute_setsockopt to sockptr_t

2020-07-24 15:41:54 -07:00

ipcomp6.c

ipcomp: assign if_id to child tunnel from parent tunnel

2020-07-09 12:55:37 +02:00

ipv6_sockglue.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2020-08-02 01:02:12 -07:00

Kconfig

Replace HTTP links with HTTPS ones: IPv*

2020-07-06 13:23:03 -07:00

Makefile

…

mcast_snoop.c

…

mcast.c

mld: fix memory leak in ipv6_mc_destroy_dev()

2020-06-15 13:29:39 -07:00

mip6.c

…

ndisc.c

…

netfilter.c

netfilter: avoid ipv6 -> nf_defrag_ipv6 module dependency

2020-08-13 04:16:15 +02:00

output_core.c

…

ping.c

ipv6/ping: set skb->mark on icmpv6 sockets

2020-07-03 14:36:04 -07:00

proc.c

…

protocol.c

…

raw.c

net: pass a sockptr_t into ->setsockopt

2020-07-24 15:41:54 -07:00

reassembly.c

…

route.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

2020-08-03 18:27:40 -07:00

rpl_iptunnel.c

net: ipv6: Use struct_size() helper and kcalloc()

2020-06-23 20:27:09 -07:00

rpl.c

…

seg6_hmac.c

…

seg6_iptunnel.c

seg6_iptunnel: Refactor seg6_lwt_headroom out of uapi header

2020-08-03 17:57:40 -07:00

seg6_local.c

seg6: fix seg6_validate_srh() to avoid slab-out-of-bounds

2020-06-04 15:39:32 -07:00

seg6.c

seg6: fix seg6_validate_srh() to avoid slab-out-of-bounds

2020-06-04 15:39:32 -07:00

sit.c

net: sit: implement header_ops->parse_protocol for AF_PACKET

2020-06-30 12:29:39 -07:00

syncookies.c

tcp: syncookies: create mptcp request socket for ACK cookies with MPTCP option

2020-07-31 16:55:32 -07:00

sysctl_net_ipv6.c

…

tcp_ipv6.c

net/tcp: switch ->md5_parse to sockptr_t

2020-07-24 15:41:54 -07:00

tcpv6_offload.c

…

tunnel6.c

tunnel6: add tunnel6_input_afinfo for ipip and ipv6 tunnels

2020-07-09 12:52:37 +02:00

udp_impl.h

net: pass a sockptr_t into ->setsockopt

2020-07-24 15:41:54 -07:00

udp_offload.c

…

udp.c

udp, bpf: Ignore connections in reuseport group after BPF sk lookup

2020-07-31 02:00:48 +02:00

udplite.c

net/ipv6: remove compat_ipv6_{get,set}sockopt

2020-07-19 18:16:41 -07:00

xfrm6_input.c

…

xfrm6_output.c

…

xfrm6_policy.c

…

xfrm6_protocol.c

…

xfrm6_state.c

…

xfrm6_tunnel.c

…