[kernel] r16497 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Fri Oct 29 09:02:10 2010
New Revision: 16497

Log:
phonet: device notifier only runs on initial namespace (Really closes: #597904)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/phonet-device-notifier-only-runs-on-initial-namespace.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/27

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Oct 27 23:11:55 2010	(r16496)
+++ dists/sid/linux-2.6/debian/changelog	Fri Oct 29 09:02:10 2010	(r16497)
@@ -16,6 +16,8 @@
     - Add Catalan (Jordi Mallach) (Closes: #601146)
     - Add Brazilian Portugese (Flamarion Jorge) (Closes: #601102)
     - Update Vietnamese (Clytie Siddall) (Closes: #601534)
+  * phonet: device notifier only runs on initial namespace
+    (Really closes: #597904)
 
   [ Ian Campbell ]
   * xen: import additional fixes for disabling netfront smartpoll mode

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/phonet-device-notifier-only-runs-on-initial-namespace.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/phonet-device-notifier-only-runs-on-initial-namespace.patch	Fri Oct 29 09:02:10 2010	(r16497)
@@ -0,0 +1,33 @@
+From: Rémi Denis-Courmont <remi.denis-courmont at nokia.com>
+Subject: [PATCH] Phonet: device notifier only runs on initial namespace
+Date: Mon, 25 Oct 2010 10:43:32 +0300
+
+This should really fix the OOPS when doing:
+
+  unshare(CLONE_NEWNET);
+  exit(0);
+
+while the phonet module is loaded.
+
+Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont at nokia.com>
+---
+ net/phonet/pn_dev.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c
+index 5a2275c..d94ca91 100644
+--- a/net/phonet/pn_dev.c
++++ b/net/phonet/pn_dev.c
+@@ -225,6 +225,9 @@ static int phonet_device_notify(struct notifier_block *me, unsigned long what,
+ {
+ 	struct net_device *dev = arg;
+ 
++	if (!net_eq(dev_net(dev), &init_net))
++		return 0;
++
+ 	switch (what) {
+ 	case NETDEV_REGISTER:
+ 		if (dev->type == ARPHRD_PHONET)
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/27
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/27	Wed Oct 27 23:11:55 2010	(r16496)
+++ dists/sid/linux-2.6/debian/patches/series/27	Fri Oct 29 09:02:10 2010	(r16497)
@@ -12,3 +12,4 @@
 + bugfix/all/e1000e-Reset-82577+82578-PHY-before-first-PHY-register-read.patch
 + bugfix/arm/kirkwood-reset-pcie.patch
 + bugfix/arm/kirkwood-reset-pcie-restrict.patch
++ bugfix/all/phonet-device-notifier-only-runs-on-initial-namespace.patch