diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-08 11:35:10 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2008-10-08 11:35:10 +0200 |
| commit | b8b8063e0d0835fb44c88d9fded2be31c9a1757e (patch) | |
| tree | a0a7283b2aa8988bc36a99be1fccc4ce513ac548 | |
| parent | 0e6e75af921d1f4799eeb9f83a31c86ab7cdeb8f (diff) | |
| download | linux-3.10-b8b8063e0d0835fb44c88d9fded2be31c9a1757e.tar.gz linux-3.10-b8b8063e0d0835fb44c88d9fded2be31c9a1757e.tar.bz2 linux-3.10-b8b8063e0d0835fb44c88d9fded2be31c9a1757e.zip | |
netfilter: netns nat: fix ipt_MASQUERADE in netns
First, allow entry in notifier hook.
Second, start conntrack cleanup in netns to which netdevice belongs.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
| -rw-r--r-- | net/ipv4/netfilter/ipt_MASQUERADE.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c index 5e1c81791e5..65c811b27b7 100644 --- a/net/ipv4/netfilter/ipt_MASQUERADE.c +++ b/net/ipv4/netfilter/ipt_MASQUERADE.c @@ -119,9 +119,7 @@ static int masq_device_event(struct notifier_block *this, void *ptr) { const struct net_device *dev = ptr; - - if (!net_eq(dev_net(dev), &init_net)) - return NOTIFY_DONE; + struct net *net = dev_net(dev); if (event == NETDEV_DOWN) { /* Device was downed. Search entire table for @@ -129,7 +127,7 @@ static int masq_device_event(struct notifier_block *this, and forget them. */ NF_CT_ASSERT(dev->ifindex != 0); - nf_ct_iterate_cleanup(&init_net, device_cmp, + nf_ct_iterate_cleanup(net, device_cmp, (void *)(long)dev->ifindex); } |