Home » Mailing list archives » linux-netdev » 2008 » September » 8

[PATCH 04/33] Fix {ip,6}_route_me_harder() in netns

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Alexey Dobriyan
Subject: [PATCH 04/33] Fix {ip,6}_route_me_harder() in netns
Date: Sunday, September 7, 2008 - 8:02 pm

Take netns from skb->dst->dev. It should be safe because, they are called
from LOCAL_OUT hook where dst is valid (though, I'm not exactly sure about
IPVS and queueing packets to userspace).

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index f8edacd..9c54024 100644
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
@@ -12,6 +12,7 @@
 /* route_me_harder function, used by iptable_nat, iptable_mangle + ip_queue */
 int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type)
 {
+	struct net *net = dev_net(skb->dst->dev);
 	const struct iphdr *iph = ip_hdr(skb);
 	struct rtable *rt;
 	struct flowi fl = {};
@@ -19,7 +20,7 @@ int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type)
 	unsigned int hh_len;
 	unsigned int type;
 
-	type = inet_addr_type(&init_net, iph->saddr);
+	type = inet_addr_type(net, iph->saddr);
 	if (addr_type == RTN_UNSPEC)
 		addr_type = type;
 
@@ -33,7 +34,7 @@ int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type)
 		fl.nl_u.ip4_u.tos = RT_TOS(iph->tos);
 		fl.oif = skb->sk ? skb->sk->sk_bound_dev_if : 0;
 		fl.mark = skb->mark;
-		if (ip_route_output_key(&init_net, &rt, &fl) != 0)
+		if (ip_route_output_key(net, &rt, &fl) != 0)
 			return -1;
 
 		/* Drop old route. */
@@ -43,7 +44,7 @@ int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type)
 		/* non-local src, find valid iif to satisfy
 		 * rp-filter when calling ip_route_input. */
 		fl.nl_u.ip4_u.daddr = iph->saddr;
-		if (ip_route_output_key(&init_net, &rt, &fl) != 0)
+		if (ip_route_output_key(net, &rt, &fl) != 0)
 			return -1;
 
 		odst = skb->dst;
diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c
index 8c6c5e7..4cb4844 100644
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -23,7 +23,7 @@ int ip6_route_me_harder(struct sk_buff *skb)
 		    .saddr = iph->saddr, } },
 	};
 
-	dst = ip6_route_output(&init_net, skb->sk, &fl);
+	dst = ip6_route_output(dev_net(skb->dst->dev), skb->sk, &fl);
 
 #ifdef CONFIG_XFRM
 	if (!(IP6CB(skb)->flags & IP6SKB_XFRM_TRANSFORMED) &&
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 10/38] netns ct: per-netns expectations, adobriyan, (Thu Aug 21, 3:00 pm)
Re: [PATCH 10/38] netns ct: per-netns expectations, Patrick McHardy, (Thu Sep 4, 9:43 am)
[PATCH 01/33] nf_conntrack_sip: de-static helper pointers, Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 02/33] nf_conntrack_gre: more locking around keymap ..., Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 03/33] nf_conntrack_gre: nf_ct_gre_keymap_flush() f ..., Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 04/33] Fix {ip,6}_route_me_harder() in netns, Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 05/33] netns ct: per-netns expectations, Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 06/33] netns ct: per-netns unconfirmed list, Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 07/33] netns ct: pass netns pointer to nf_conntrack ..., Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 08/33] netns ct: pass netns pointer to L4 protocol' ..., Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 09/33] netns ct: per-netns /proc/net/nf_conntrack, ..., Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 10/33] netns ct: per-netns /proc/net/nf_conntrack_e ..., Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 11/33] netns ct: per-netns /proc/net/ip_conntrack, ..., Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 12/33] netns ct: export netns list, Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 13/33] netns ct: unregister helper in every netns, Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 14/33] netns ct: cleanup after L3 and L4 proto unre ..., Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 15/33] netns ct: pass conntrack to nf_conntrack_eve ..., Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 16/33] netns ct: per-netns event cache, Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 17/33] netns ct: final init_net tweaks, Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 17/33] netns ct: final init_net tweaks, Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 19/33] netns ct: per-netns /proc/net/stat/nf_conntr ..., Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 20/33] netns ct: per-netns net.netfilter.nf_conntra ..., Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 21/33] netns ct: per-netns net.netfilter.nf_conntra ..., Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 22/33] netns ct: per-netns net.netfilter.nf_conntra ..., Alexey Dobriyan, (Sun Sep 7, 8:02 pm)
[PATCH 22/33] netns ct: per-netns net.netfilter.nf_conntra ..., Alexey Dobriyan, (Sun Sep 7, 8:03 pm)
[PATCH 24/33] netns ct: SIP conntracking in netns, Alexey Dobriyan, (Sun Sep 7, 8:03 pm)
[PATCH 25/33] netns ct: H323 conntracking in netns, Alexey Dobriyan, (Sun Sep 7, 8:03 pm)
[PATCH 26/33] netns ct: GRE conntracking in netns, Alexey Dobriyan, (Sun Sep 7, 8:03 pm)
[PATCH 27/33] netns ct: PPTP conntracking in netns, Alexey Dobriyan, (Sun Sep 7, 8:03 pm)
[PATCH 28/33] netns nat: fix ipt_MASQUERADE in netns, Alexey Dobriyan, (Sun Sep 7, 8:03 pm)
[PATCH 29/33] netns nat: per-netns NAT table, Alexey Dobriyan, (Sun Sep 7, 8:03 pm)
[PATCH 30/33] netns nat: per-netns bysource hash, Alexey Dobriyan, (Sun Sep 7, 8:03 pm)
[PATCH 31/33] netns ct: fixup DNAT in netns, Alexey Dobriyan, (Sun Sep 7, 8:03 pm)
[PATCH 32/33] netns nat: PPTP NAT in netns, Alexey Dobriyan, (Sun Sep 7, 8:03 pm)
[PATCH 33/33] Enable netfilter in netns, Alexey Dobriyan, (Sun Sep 7, 8:03 pm)
Re: [PATCH 03/33] nf_conntrack_gre: nf_ct_gre_keymap_flush ..., Patrick McHardy, (Mon Sep 8, 10:39 pm)
Re: [PATCH 04/33] Fix {ip,6}_route_me_harder() in netns, Patrick McHardy, (Mon Sep 8, 10:44 pm)
Re: [PATCH 05/33] netns ct: per-netns expectations, Patrick McHardy, (Mon Sep 8, 10:49 pm)
Re: [PATCH 06/33] netns ct: per-netns unconfirmed list, Patrick McHardy, (Mon Sep 8, 10:50 pm)
Re: [PATCH 07/33] netns ct: pass netns pointer to nf_connt ..., Patrick McHardy, (Mon Sep 8, 10:52 pm)
Re: [PATCH 08/33] netns ct: pass netns pointer to L4 proto ..., Patrick McHardy, (Mon Sep 8, 10:54 pm)
Re: [PATCH 09/33] netns ct: per-netns /proc/net/nf_conntra ..., Patrick McHardy, (Mon Sep 8, 10:56 pm)
Re: [PATCH 10/33] netns ct: per-netns /proc/net/nf_conntra ..., Patrick McHardy, (Mon Sep 8, 10:57 pm)
Re: [PATCH 11/33] netns ct: per-netns /proc/net/ip_conntra ..., Patrick McHardy, (Mon Sep 8, 10:59 pm)
Re: [PATCH 12/33] netns ct: export netns list, Patrick McHardy, (Mon Sep 8, 10:59 pm)
Re: [PATCH 13/33] netns ct: unregister helper in every netns, Patrick McHardy, (Mon Sep 8, 11:01 pm)
Re: [PATCH 14/33] netns ct: cleanup after L3 and L4 proto ..., Patrick McHardy, (Mon Sep 8, 11:03 pm)
Re: [PATCH 15/33] netns ct: pass conntrack to nf_conntrack ..., Patrick McHardy, (Mon Sep 8, 11:04 pm)
Re: [PATCH 16/33] netns ct: per-netns event cache, Patrick McHardy, (Mon Sep 8, 11:12 pm)
Re: [PATCH 16/33] netns ct: per-netns event cache, Patrick McHardy, (Tue Sep 9, 12:07 am)
Re: [PATCH 05/33] netns ct: per-netns expectations, Alexey Dobriyan, (Tue Sep 9, 12:07 am)
Re: [PATCH 16/33] netns ct: per-netns event cache, Alexey Dobriyan, (Tue Sep 9, 12:07 am)
Re: [PATCH 05/33] netns ct: per-netns expectations, Patrick McHardy, (Tue Sep 9, 12:10 am)
Re: [PATCH 16/33] netns ct: per-netns event cache, Patrick McHardy, (Tue Sep 9, 12:16 am)
Re: [PATCH 17/33] netns ct: final init_net tweaks, Patrick McHardy, (Tue Sep 9, 12:20 am)
Re: [PATCH 17/33] netns ct: final init_net tweaks, Alexey Dobriyan, (Tue Sep 9, 12:32 am)
Re: [PATCH 17/33] netns ct: final init_net tweaks, Patrick McHardy, (Tue Sep 9, 12:51 am)
Re: [PATCH 17/33] netns ct: final init_net tweaks, Alexey Dobriyan, (Sat Sep 13, 3:45 am)
[PATCH v2 1/6] netns ct: per-netns statistics, Alexey Dobriyan, (Sat Sep 13, 3:48 am)
[PATCH v2 2/6] netns ct: per-netns /proc/net/stat/nf_connt ..., Alexey Dobriyan, (Sat Sep 13, 3:49 am)
[PATCH v2 3/6] netns ct: per-netns net.netfilter.nf_conntr ..., Alexey Dobriyan, (Sat Sep 13, 3:51 am)
[PATCH v2 4/6] netns ct: per-netns net.netfilter.nf_conntr ..., Alexey Dobriyan, (Sat Sep 13, 3:52 am)
[PATCH v2 5/6] netns ct: per-netns net.netfilter.nf_conntr ..., Alexey Dobriyan, (Sat Sep 13, 3:53 am)
[PATCH v2 6/6] netns ct: per-netns conntrack accounting, Alexey Dobriyan, (Sat Sep 13, 3:55 am)
[PATCH v2 7/6] netns ct: final netns tweaks, Alexey Dobriyan, (Fri Sep 26, 4:59 pm)
Re: [PATCH 17/33] netns ct: final init_net tweaks, Alexey Dobriyan, (Fri Sep 26, 5:00 pm)
Re: [PATCH 17/33] netns ct: final init_net tweaks, Patrick McHardy, (Sun Sep 28, 3:31 am)
Re: [PATCH v2 1/6] netns ct: per-netns statistics, Patrick McHardy, (Thu Oct 2, 12:58 am)
Re: [PATCH v2 2/6] netns ct: per-netns /proc/net/stat/nf_c ..., Patrick McHardy, (Thu Oct 2, 12:59 am)
Re: [PATCH v2 3/6] netns ct: per-netns net.netfilter.nf_co ..., Patrick McHardy, (Thu Oct 2, 1:00 am)
Re: [PATCH v2 4/6] netns ct: per-netns net.netfilter.nf_co ..., Patrick McHardy, (Thu Oct 2, 1:02 am)
Re: [PATCH v2 5/6] netns ct: per-netns net.netfilter.nf_co ..., Patrick McHardy, (Thu Oct 2, 1:04 am)
Re: [PATCH v2 6/6] netns ct: per-netns conntrack accounting, Patrick McHardy, (Thu Oct 2, 1:06 am)
Re: [PATCH v2 7/6] netns ct: final netns tweaks, Patrick McHardy, (Thu Oct 2, 1:11 am)
Re: [PATCH 24/33] netns ct: SIP conntracking in netns, Patrick McHardy, (Thu Oct 2, 1:52 am)
Re: [PATCH 25/33] netns ct: H323 conntracking in netns, Patrick McHardy, (Thu Oct 2, 1:52 am)
Re: [PATCH 26/33] netns ct: GRE conntracking in netns, Patrick McHardy, (Thu Oct 2, 1:53 am)
Re: [PATCH 27/33] netns ct: PPTP conntracking in netns, Patrick McHardy, (Thu Oct 2, 1:54 am)
Re: [PATCH 28/33] netns nat: fix ipt_MASQUERADE in netns, Patrick McHardy, (Thu Oct 2, 2:06 am)
Re: [PATCH 29/33] netns nat: per-netns NAT table, Patrick McHardy, (Thu Oct 2, 2:08 am)
Re: [PATCH 29/33] netns nat: per-netns NAT table, Patrick McHardy, (Thu Oct 2, 2:09 am)
Re: [PATCH 30/33] netns nat: per-netns bysource hash, Patrick McHardy, (Thu Oct 2, 2:09 am)
Re: [PATCH 31/33] netns ct: fixup DNAT in netns, Patrick McHardy, (Thu Oct 2, 2:10 am)
Re: [PATCH 32/33] netns nat: PPTP NAT in netns, Patrick McHardy, (Thu Oct 2, 2:11 am)
Re: [PATCH 33/33] Enable netfilter in netns, Patrick McHardy, (Thu Oct 2, 2:12 am)
Re: [PATCH 33/33] Enable netfilter in netns, Alexey Dobriyan, (Thu Oct 2, 2:51 am)
Re: [PATCH 33/33] Enable netfilter in netns, Alexey Dobriyan, (Thu Oct 2, 2:53 am)
Re: [PATCH 33/33] Enable netfilter in netns, Patrick McHardy, (Thu Oct 2, 3:00 am)