Merge branch 'udp_tunnel_sk'

Prevent UDP tunnels from operating on garbage socket So this should do the rest of the work such that when we encapsulate into a UDP tunnel, the output path works on the UDP tunnel's socket rather than skb->sk. Part of this work is based upon changes done by Jiri Pirko some time ago. Basically the first step is to pass the socket through the nf_hook okfn(), and then next we do the same for the UDP tunnel xmit routines. Signed-off-by: David S. Miller <davem@davemloft.net>
2026-11-13 07:31:07 +00:00 · 2015-04-07 15:29:30 -04:00 · 2015-04-07 15:29:30 -04:00 · e0e8db2f89
commit e0e8db2f89
parent a3786a5ff7 79b16aadea
51 changed files with 349 additions and 251 deletions
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
--- a/include/linux/netfilter_bridge.h
+++ b/include/linux/netfilter_bridge.h
--- a/include/net/dn_neigh.h
+++ b/include/net/dn_neigh.h
--- a/include/net/ip.h
+++ b/include/net/ip.h
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
--- a/include/net/ip6_tunnel.h
+++ b/include/net/ip6_tunnel.h
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
--- a/include/net/udp_tunnel.h
+++ b/include/net/udp_tunnel.h
--- a/include/net/vxlan.h
+++ b/include/net/vxlan.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
--- a/net/bridge/br_stp_bpdu.c
+++ b/net/bridge/br_stp_bpdu.c
--- a/net/core/dev.c
+++ b/net/core/dev.c
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
--- a/net/decnet/dn_nsp_in.c
+++ b/net/decnet/dn_nsp_in.c
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
--- a/net/ipv4/geneve.c
+++ b/net/ipv4/geneve.c
--- a/net/ipv4/ip_forward.c
+++ b/net/ipv4/ip_forward.c
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
--- a/net/ipv4/udp_tunnel.c
+++ b/net/ipv4/udp_tunnel.c
--- a/net/ipv4/xfrm4_input.c
+++ b/net/ipv4/xfrm4_input.c
--- a/net/ipv4/xfrm4_output.c
+++ b/net/ipv4/xfrm4_output.c
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
--- a/net/ipv6/ip6_udp_tunnel.c
+++ b/net/ipv6/ip6_udp_tunnel.c
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
--- a/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
+++ b/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
--- a/net/ipv6/output_core.c
+++ b/net/ipv6/output_core.c
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
--- a/net/ipv6/xfrm6_input.c
+++ b/net/ipv6/xfrm6_input.c
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
--- a/net/openvswitch/vport-vxlan.c
+++ b/net/openvswitch/vport-vxlan.c
--- a/net/tipc/udp_media.c
+++ b/net/tipc/udp_media.c
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c