---

yaml --- r: 98367 b: refs/heads/master c: b9f75f4 h: refs/heads/master i: 98365: f79468a 98363: 9c5454a 98359: 141e148 98351: a1cfff8 98335: 741e0d1 98303: 8d3fd52 v: v3
git-mirror · Jun 21, 2008 · 02581e5 · 02581e5
1 parent dc5e833
commit 02581e5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 735ce972fbc8a65fb17788debd7bbe7b4383cc62
+refs/heads/master: b9f75f45a6b46a0ab4eb0857d437a0845871f314
diff --git a/trunk/include/net/net_namespace.h b/trunk/include/net/net_namespace.h
@@ -95,6 +95,11 @@ extern struct list_head net_namespace_list;
 #ifdef CONFIG_NET_NS
 extern void __put_net(struct net *net);
 
+static inline int net_alive(struct net *net)
+{
+	return net && atomic_read(&net->count);
+}
+
 static inline struct net *get_net(struct net *net)
 {
 	atomic_inc(&net->count);
@@ -125,6 +130,12 @@ int net_eq(const struct net *net1, const struct net *net2)
 	return net1 == net2;
 }
 #else
+
+static inline int net_alive(struct net *net)
+{
+	return 1;
+}
+
 static inline struct net *get_net(struct net *net)
 {
 	return net;

diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -2077,6 +2077,10 @@ int netif_receive_skb(struct sk_buff *skb)
 
 	rcu_read_lock();
 
+	/* Don't receive packets in an exiting network namespace */
+	if (!net_alive(dev_net(skb->dev)))
+		goto out;
+
 #ifdef CONFIG_NET_CLS_ACT
 	if (skb->tc_verd & TC_NCLS) {
 		skb->tc_verd = CLR_TC_NCLS(skb->tc_verd);

diff --git a/trunk/net/core/net_namespace.c b/trunk/net/core/net_namespace.c
@@ -140,6 +140,9 @@ static void cleanup_net(struct work_struct *work)
 	struct pernet_operations *ops;
 	struct net *net;
 
+	/* Be very certain incoming network packets will not find us */
+	rcu_barrier();
+
 	net = container_of(work, struct net, work);
 
 	mutex_lock(&net_mutex);