diff --git a/[refs] b/[refs] index 6f179b867dd4..8c23f0d12c44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05cf89d40c85e622dac20e44713168767be5c520 +refs/heads/master: 0be43f82c4f4c4a999b53cf794513f7f1a4ed7f3 diff --git a/trunk/net/netfilter/core.c b/trunk/net/netfilter/core.c index c4065b8f9a95..ec05684c56d7 100644 --- a/trunk/net/netfilter/core.c +++ b/trunk/net/netfilter/core.c @@ -165,6 +165,14 @@ int nf_hook_slow(int pf, unsigned int hook, struct sk_buff *skb, unsigned int verdict; int ret = 0; +#ifdef CONFIG_NET_NS + struct net *net; + + net = indev == NULL ? outdev->nd_net : indev->nd_net; + if (net != &init_net) + return 1; +#endif + /* We may already have this, but read-locks nest anyway */ rcu_read_lock();