]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple
authorEric W. Biederman <ebiederm@xmission.com>
Fri, 18 Sep 2015 19:33:04 +0000 (14:33 -0500)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 18 Sep 2015 20:00:04 +0000 (22:00 +0200)
commita31f1adc0948930fba9ab5a111ccd735a5d864c6
treea1665b8a85df5c0a17cf8d6ed01f6fd9b5250a12
parenta4ffe319ae72034e3f3332698a2fd83b6f063b18
netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple

As gre does not have the srckey in the packet gre_pkt_to_tuple
needs to perform a lookup in it's per network namespace tables.

Pass in the proper network namespace to all pkt_to_tuple
implementations to ensure gre (and any similar protocols) can get this
right.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
16 files changed:
include/net/netfilter/nf_conntrack.h
include/net/netfilter/nf_conntrack_core.h
include/net/netfilter/nf_conntrack_l4proto.h
net/ipv4/netfilter/nf_conntrack_proto_icmp.c
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_proto_dccp.c
net/netfilter/nf_conntrack_proto_generic.c
net/netfilter/nf_conntrack_proto_gre.c
net/netfilter/nf_conntrack_proto_sctp.c
net/netfilter/nf_conntrack_proto_tcp.c
net/netfilter/nf_conntrack_proto_udp.c
net/netfilter/nf_conntrack_proto_udplite.c
net/netfilter/xt_connlimit.c
net/openvswitch/conntrack.c
net/sched/act_connmark.c