---

yaml --- r: 119073 b: refs/heads/master c: 9c0188a h: refs/heads/master i: 119071: 54411f9 v: v3
git-mirror · Nov 13, 2008 · 222e8cd · 222e8cd
1 parent 1dfbdb2
commit 222e8cd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e093d9dfffc9a02cd54d36904c62f705f09900a
+refs/heads/master: 9c0188acf6dd6990bac9cd906cd554a1476c6d12
diff --git a/trunk/net/ipv4/ip_input.c b/trunk/net/ipv4/ip_input.c
@@ -209,9 +209,17 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
 
 		hash = protocol & (MAX_INET_PROTOS - 1);
 		ipprot = rcu_dereference(inet_protos[hash]);
-		if (ipprot != NULL && (net == &init_net || ipprot->netns_ok)) {
+		if (ipprot != NULL) {
 			int ret;
 
+			if (!net_eq(net, &init_net) && !ipprot->netns_ok) {
+				if (net_ratelimit())
+					printk("%s: proto %d isn't netns-ready\n",
+						__func__, protocol);
+				kfree_skb(skb);
+				goto out;
+			}
+
 			if (!ipprot->no_policy) {
 				if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
 					kfree_skb(skb);