From: Alexey Dobriyan <adobriyan@gmail.com>
To: kaber@trash.net
Cc: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org,
containers@lists.linux-foundation.org
Subject: [PATCH 04/33] Fix {ip,6}_route_me_harder() in netns
Date: Mon, 8 Sep 2008 07:02:41 +0400 [thread overview]
Message-ID: <1220842990-30500-4-git-send-email-adobriyan@gmail.com> (raw)
In-Reply-To: <48C01046.2070704@trash.net>
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) &&
next prev parent reply other threads:[~2008-09-08 3:01 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-21 22:00 [PATCH 10/38] netns ct: per-netns expectations adobriyan
2008-09-04 16:43 ` Patrick McHardy
2008-09-08 3:02 ` [PATCH 01/33] nf_conntrack_sip: de-static helper pointers Alexey Dobriyan
2008-09-08 3:02 ` [PATCH 02/33] nf_conntrack_gre: more locking around keymap list Alexey Dobriyan
2008-09-08 3:02 ` [PATCH 03/33] nf_conntrack_gre: nf_ct_gre_keymap_flush() fixlet Alexey Dobriyan
2008-09-09 5:39 ` Patrick McHardy
2008-09-08 3:02 ` Alexey Dobriyan [this message]
2008-09-09 5:44 ` [PATCH 04/33] Fix {ip,6}_route_me_harder() in netns Patrick McHardy
2008-09-08 3:02 ` [PATCH 05/33] netns ct: per-netns expectations Alexey Dobriyan
2008-09-09 5:49 ` Patrick McHardy
2008-09-09 7:07 ` Alexey Dobriyan
2008-09-09 7:10 ` Patrick McHardy
2008-09-08 3:02 ` [PATCH 06/33] netns ct: per-netns unconfirmed list Alexey Dobriyan
2008-09-09 5:50 ` Patrick McHardy
2008-09-08 3:02 ` [PATCH 07/33] netns ct: pass netns pointer to nf_conntrack_in() Alexey Dobriyan
2008-09-09 5:52 ` Patrick McHardy
2008-09-08 3:02 ` [PATCH 08/33] netns ct: pass netns pointer to L4 protocol's ->error hook Alexey Dobriyan
2008-09-09 5:54 ` Patrick McHardy
2008-09-08 3:02 ` [PATCH 09/33] netns ct: per-netns /proc/net/nf_conntrack, /proc/net/stat/nf_conntrack Alexey Dobriyan
2008-09-09 5:56 ` Patrick McHardy
2008-09-08 3:02 ` [PATCH 10/33] netns ct: per-netns /proc/net/nf_conntrack_expect Alexey Dobriyan
2008-09-09 5:57 ` Patrick McHardy
2008-09-08 3:02 ` [PATCH 11/33] netns ct: per-netns /proc/net/ip_conntrack, /proc/net/stat/ip_conntrack, /proc/net/ip_conntrack_expect Alexey Dobriyan
2008-09-09 5:59 ` Patrick McHardy
2008-09-08 3:02 ` [PATCH 12/33] netns ct: export netns list Alexey Dobriyan
2008-09-09 5:59 ` Patrick McHardy
2008-09-08 3:02 ` [PATCH 13/33] netns ct: unregister helper in every netns Alexey Dobriyan
2008-09-09 6:01 ` Patrick McHardy
2008-09-08 3:02 ` [PATCH 14/33] netns ct: cleanup after L3 and L4 proto unregister " Alexey Dobriyan
2008-09-09 6:03 ` Patrick McHardy
2008-09-08 3:02 ` [PATCH 15/33] netns ct: pass conntrack to nf_conntrack_event_cache() not skb Alexey Dobriyan
2008-09-09 6:04 ` Patrick McHardy
2008-09-08 3:02 ` [PATCH 16/33] netns ct: per-netns event cache Alexey Dobriyan
[not found] ` <1220842990-30500-16-git-send-email-adobriyan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2008-09-09 6:12 ` Patrick McHardy
2008-09-09 7:07 ` Alexey Dobriyan
2008-09-09 7:07 ` Patrick McHardy
2008-09-09 7:16 ` Patrick McHardy
2008-09-08 3:02 ` [PATCH 17/33] netns ct: final init_net tweaks Alexey Dobriyan
2008-09-09 7:20 ` Patrick McHardy
2008-09-09 7:32 ` Alexey Dobriyan
2008-09-09 7:51 ` Patrick McHardy
2008-09-13 10:45 ` Alexey Dobriyan
2008-09-27 0:00 ` Alexey Dobriyan
2008-09-28 10:31 ` Patrick McHardy
2008-09-13 10:48 ` [PATCH v2 1/6] netns ct: per-netns statistics Alexey Dobriyan
2008-10-02 7:58 ` Patrick McHardy
2008-09-13 10:49 ` [PATCH v2 2/6] netns ct: per-netns /proc/net/stat/nf_conntrack , /proc/net/stat/ip_conntrack Alexey Dobriyan
2008-10-02 7:59 ` Patrick McHardy
2008-09-13 10:51 ` [PATCH v2 3/6] netns ct: per-netns net.netfilter.nf_conntrack_count sysctl Alexey Dobriyan
2008-10-02 8:00 ` Patrick McHardy
2008-09-13 10:52 ` [PATCH v2 4/6] netns ct: per-netns net.netfilter.nf_conntrack_checksum sysctl Alexey Dobriyan
2008-10-02 8:02 ` Patrick McHardy
2008-09-13 10:53 ` [PATCH v2 5/6] netns ct: per-netns net.netfilter.nf_conntrack_log_invalid sysctl Alexey Dobriyan
2008-10-02 8:04 ` Patrick McHardy
2008-09-13 10:55 ` [PATCH v2 6/6] netns ct: per-netns conntrack accounting Alexey Dobriyan
2008-09-26 23:59 ` [PATCH v2 7/6] netns ct: final netns tweaks Alexey Dobriyan
2008-10-02 8:11 ` Patrick McHardy
2008-10-02 8:06 ` [PATCH v2 6/6] netns ct: per-netns conntrack accounting Patrick McHardy
2008-09-08 3:02 ` [PATCH 17/33] netns ct: final init_net tweaks Alexey Dobriyan
2008-09-08 3:02 ` [PATCH 19/33] netns ct: per-netns /proc/net/stat/nf_conntrack, /proc/net/stat/ip_conntrack Alexey Dobriyan
2008-09-08 3:02 ` [PATCH 20/33] netns ct: per-netns net.netfilter.nf_conntrack_count sysctl Alexey Dobriyan
2008-09-08 3:02 ` [PATCH 21/33] netns ct: per-netns net.netfilter.nf_conntrack_checksum sysctl Alexey Dobriyan
2008-09-08 3:02 ` [PATCH 22/33] netns ct: per-netns net.netfilter.nf_conntrack_log_invalid sysctl Alexey Dobriyan
2008-09-08 3:03 ` Alexey Dobriyan
2008-09-08 3:03 ` [PATCH 24/33] netns ct: SIP conntracking in netns Alexey Dobriyan
2008-10-02 8:52 ` Patrick McHardy
2008-09-08 3:03 ` [PATCH 25/33] netns ct: H323 " Alexey Dobriyan
2008-10-02 8:52 ` Patrick McHardy
2008-09-08 3:03 ` [PATCH 26/33] netns ct: GRE " Alexey Dobriyan
2008-10-02 8:53 ` Patrick McHardy
2008-09-08 3:03 ` [PATCH 27/33] netns ct: PPTP " Alexey Dobriyan
2008-10-02 8:54 ` Patrick McHardy
2008-09-08 3:03 ` [PATCH 28/33] netns nat: fix ipt_MASQUERADE " Alexey Dobriyan
2008-10-02 9:06 ` Patrick McHardy
2008-09-08 3:03 ` [PATCH 29/33] netns nat: per-netns NAT table Alexey Dobriyan
2008-10-02 9:08 ` Patrick McHardy
2008-10-02 9:09 ` Patrick McHardy
2008-09-08 3:03 ` [PATCH 30/33] netns nat: per-netns bysource hash Alexey Dobriyan
2008-10-02 9:09 ` Patrick McHardy
2008-09-08 3:03 ` [PATCH 31/33] netns ct: fixup DNAT in netns Alexey Dobriyan
2008-10-02 9:10 ` Patrick McHardy
2008-09-08 3:03 ` [PATCH 32/33] netns nat: PPTP NAT " Alexey Dobriyan
2008-10-02 9:11 ` Patrick McHardy
2008-09-08 3:03 ` [PATCH 33/33] Enable netfilter " Alexey Dobriyan
2008-10-02 9:12 ` Patrick McHardy
2008-10-02 9:51 ` Alexey Dobriyan
2008-10-02 10:00 ` Patrick McHardy
2008-10-02 9:53 ` Alexey Dobriyan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1220842990-30500-4-git-send-email-adobriyan@gmail.com \
--to=adobriyan@gmail.com \
--cc=containers@lists.linux-foundation.org \
--cc=kaber@trash.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).