aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-09-12 07:02:17 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:49:09 -0400
commite9dc86534051b78e41e5b746cccc291b57a3a311 (patch)
tree1cd4a1dde4c51b6311749428a22cc8a8f5436825 /drivers/net
parente730c15519d09ea528b4d2f1103681fa5937c0e6 (diff)
[NET]: Make device event notification network namespace safe
Every user of the network device notifiers is either a protocol stack or a pseudo device. If a protocol stack that does not have support for multiple network namespaces receives an event for a device that is not in the initial network namespace it quite possibly can get confused and do the wrong thing. To avoid problems until all of the protocol stacks are converted this patch modifies all netdev event handlers to ignore events on devices that are not in the initial network namespace. As the rest of the code is made network namespace aware these checks can be removed. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/bonding/bond_main.c3
-rw-r--r--drivers/net/hamradio/bpqether.c3
-rw-r--r--drivers/net/pppoe.c3
-rw-r--r--drivers/net/wan/dlci.c3
-rw-r--r--drivers/net/wan/hdlc.c3
-rw-r--r--drivers/net/wan/lapbether.c3
6 files changed, 18 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index e4e5fdc0430b..cf97d8a6326e 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3299,6 +3299,9 @@ static int bond_netdev_event(struct notifier_block *this, unsigned long event, v
3299{ 3299{
3300 struct net_device *event_dev = (struct net_device *)ptr; 3300 struct net_device *event_dev = (struct net_device *)ptr;
3301 3301
3302 if (event_dev->nd_net != &init_net)
3303 return NOTIFY_DONE;
3304
3302 dprintk("event_dev: %s, event: %lx\n", 3305 dprintk("event_dev: %s, event: %lx\n",
3303 (event_dev ? event_dev->name : "None"), 3306 (event_dev ? event_dev->name : "None"),
3304 event); 3307 event);
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 85fb8e7efacf..df09210f7351 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -563,6 +563,9 @@ static int bpq_device_event(struct notifier_block *this,unsigned long event, voi
563{ 563{
564 struct net_device *dev = (struct net_device *)ptr; 564 struct net_device *dev = (struct net_device *)ptr;
565 565
566 if (dev->nd_net != &init_net)
567 return NOTIFY_DONE;
568
566 if (!dev_is_ethdev(dev)) 569 if (!dev_is_ethdev(dev))
567 return NOTIFY_DONE; 570 return NOTIFY_DONE;
568 571
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 60c0e4e17875..c5c70e4b1d36 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -301,6 +301,9 @@ static int pppoe_device_event(struct notifier_block *this,
301{ 301{
302 struct net_device *dev = (struct net_device *) ptr; 302 struct net_device *dev = (struct net_device *) ptr;
303 303
304 if (dev->nd_net != &init_net)
305 return NOTIFY_DONE;
306
304 /* Only look at sockets that are using this specific device. */ 307 /* Only look at sockets that are using this specific device. */
305 switch (event) { 308 switch (event) {
306 case NETDEV_CHANGEMTU: 309 case NETDEV_CHANGEMTU:
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 66be20c292b6..61041d5186ac 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -513,6 +513,9 @@ static int dlci_dev_event(struct notifier_block *unused,
513{ 513{
514 struct net_device *dev = (struct net_device *) ptr; 514 struct net_device *dev = (struct net_device *) ptr;
515 515
516 if (dev->nd_net != &init_net)
517 return NOTIFY_DONE;
518
516 if (event == NETDEV_UNREGISTER) { 519 if (event == NETDEV_UNREGISTER) {
517 struct dlci_local *dlp; 520 struct dlci_local *dlp;
518 521
diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c
index 3b57350eacca..ee23b91f23d9 100644
--- a/drivers/net/wan/hdlc.c
+++ b/drivers/net/wan/hdlc.c
@@ -109,6 +109,9 @@ static int hdlc_device_event(struct notifier_block *this, unsigned long event,
109 unsigned long flags; 109 unsigned long flags;
110 int on; 110 int on;
111 111
112 if (dev->nd_net != &init_net)
113 return NOTIFY_DONE;
114
112 if (dev->get_stats != hdlc_get_stats) 115 if (dev->get_stats != hdlc_get_stats)
113 return NOTIFY_DONE; /* not an HDLC device */ 116 return NOTIFY_DONE; /* not an HDLC device */
114 117
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index ca8b3c3cb931..699b93406dfb 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -394,6 +394,9 @@ static int lapbeth_device_event(struct notifier_block *this,
394 struct lapbethdev *lapbeth; 394 struct lapbethdev *lapbeth;
395 struct net_device *dev = ptr; 395 struct net_device *dev = ptr;
396 396
397 if (dev->nd_net != &init_net)
398 return NOTIFY_DONE;
399
397 if (!dev_is_ethdev(dev)) 400 if (!dev_is_ethdev(dev))
398 return NOTIFY_DONE; 401 return NOTIFY_DONE;
399 402