leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netfilter: Push struct net down into nf_afinfo.reroute

Browse Source 
The network namespace is needed when routing a packet.
Stop making nf_afinfo.reroute guess which network namespace
is the proper namespace to route the packet in.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Eric W. Biederman
2015-09-25 15:07:28 -05:00
committed by Pablo Neira Ayuso
parent 372892ec11
commit d815d90bbb
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/netfilter.h
View File

@@ -283,7 +283,7 @@ struct nf_afinfo {
struct flowi *fl, bool strict); struct flowi *fl, bool strict);
void (*saveroute)(const struct sk_buff *skb, void (*saveroute)(const struct sk_buff *skb,
struct nf_queue_entry *entry); struct nf_queue_entry *entry);
int (*reroute)(struct sk_buff *skb, int (*reroute)(struct net *net, struct sk_buff *skb,
const struct nf_queue_entry *entry); const struct nf_queue_entry *entry);
int route_key_size; int route_key_size;
}; };

2
net/ipv4/netfilter.c
View File

@@ -104,7 +104,7 @@ static void nf_ip_saveroute(const struct sk_buff *skb,
} }
} }
static int nf_ip_reroute(struct sk_buff *skb, static int nf_ip_reroute(struct net *net, struct sk_buff *skb,
const struct nf_queue_entry *entry) const struct nf_queue_entry *entry)
{ {
const struct ip_rt_info *rt_info = nf_queue_entry_reroute(entry); const struct ip_rt_info *rt_info = nf_queue_entry_reroute(entry);

2
net/ipv6/netfilter.c
View File

@@ -93,7 +93,7 @@ static void nf_ip6_saveroute(const struct sk_buff *skb,
} }
} }
static int nf_ip6_reroute(struct sk_buff *skb, static int nf_ip6_reroute(struct net *net, struct sk_buff *skb,
const struct nf_queue_entry *entry) const struct nf_queue_entry *entry)
{ {
struct ip6_rt_info *rt_info = nf_queue_entry_reroute(entry); struct ip6_rt_info *rt_info = nf_queue_entry_reroute(entry);

2
net/netfilter/nf_queue.c
View File

@@ -199,7 +199,7 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
if (verdict == NF_ACCEPT) { if (verdict == NF_ACCEPT) {
afinfo = nf_get_afinfo(entry->state.pf); afinfo = nf_get_afinfo(entry->state.pf);
if (!afinfo || afinfo->reroute(skb, entry) < 0) if (!afinfo || afinfo->reroute(entry->state.net, skb, entry) < 0)
verdict = NF_DROP; verdict = NF_DROP;
} }