diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2007-09-12 07:02:17 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:49:09 -0400 |
commit | e9dc86534051b78e41e5b746cccc291b57a3a311 (patch) | |
tree | 1cd4a1dde4c51b6311749428a22cc8a8f5436825 /net/8021q | |
parent | e730c15519d09ea528b4d2f1103681fa5937c0e6 (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 'net/8021q')
-rw-r--r-- | net/8021q/vlan.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 2a546919d6fb..d0d36fdedbe9 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <net/arp.h> | 31 | #include <net/arp.h> |
32 | #include <linux/rtnetlink.h> | 32 | #include <linux/rtnetlink.h> |
33 | #include <linux/notifier.h> | 33 | #include <linux/notifier.h> |
34 | #include <net/net_namespace.h> | ||
34 | 35 | ||
35 | #include <linux/if_vlan.h> | 36 | #include <linux/if_vlan.h> |
36 | #include "vlan.h" | 37 | #include "vlan.h" |
@@ -603,6 +604,9 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event, | |||
603 | int i, flgs; | 604 | int i, flgs; |
604 | struct net_device *vlandev; | 605 | struct net_device *vlandev; |
605 | 606 | ||
607 | if (dev->nd_net != &init_net) | ||
608 | return NOTIFY_DONE; | ||
609 | |||
606 | if (!grp) | 610 | if (!grp) |
607 | goto out; | 611 | goto out; |
608 | 612 | ||