aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
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 /net/ipv6
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 'net/ipv6')
-rw-r--r--net/ipv6/addrconf.c3
-rw-r--r--net/ipv6/ndisc.c3
-rw-r--r--net/ipv6/netfilter/ip6_queue.c3
3 files changed, 9 insertions, 0 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index cd2db728d18..1a678364652 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2259,6 +2259,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
2259 int run_pending = 0; 2259 int run_pending = 0;
2260 int err; 2260 int err;
2261 2261
2262 if (dev->nd_net != &init_net)
2263 return NOTIFY_DONE;
2264
2262 switch(event) { 2265 switch(event) {
2263 case NETDEV_REGISTER: 2266 case NETDEV_REGISTER:
2264 if (!idev && dev->mtu >= IPV6_MIN_MTU) { 2267 if (!idev && dev->mtu >= IPV6_MIN_MTU) {
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 5b596659177..d2d44dc22f1 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1525,6 +1525,9 @@ static int ndisc_netdev_event(struct notifier_block *this, unsigned long event,
1525{ 1525{
1526 struct net_device *dev = ptr; 1526 struct net_device *dev = ptr;
1527 1527
1528 if (dev->nd_net != &init_net)
1529 return NOTIFY_DONE;
1530
1528 switch (event) { 1531 switch (event) {
1529 case NETDEV_CHANGEADDR: 1532 case NETDEV_CHANGEADDR:
1530 neigh_changeaddr(&nd_tbl, dev); 1533 neigh_changeaddr(&nd_tbl, dev);
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index dfc58fbdb68..64536a3ef2f 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -547,6 +547,9 @@ ipq_rcv_dev_event(struct notifier_block *this,
547{ 547{
548 struct net_device *dev = ptr; 548 struct net_device *dev = ptr;
549 549
550 if (dev->nd_net != &init_net)
551 return NOTIFY_DONE;
552
550 /* Drop any packets associated with the downed device */ 553 /* Drop any packets associated with the downed device */
551 if (event == NETDEV_DOWN) 554 if (event == NETDEV_DOWN)
552 ipq_dev_drop(dev->ifindex); 555 ipq_dev_drop(dev->ifindex);