---

yaml --- r: 90271 b: refs/heads/master c: 0be43f8 h: refs/heads/master i: 90269: 4196d29 90267: e1ca933 90263: 1f85673 90255: 2d3c62d 90239: 7dbee9e v: v3
git-mirror · Mar 24, 2008 · 5e7637d · 5e7637d
1 parent dda0fd5
commit 5e7637d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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();