[NET]: Make the device list and device lookups per namespace.

This patch makes most of the generic device layer network
namespace safe.  This patch makes dev_base_head a
network namespace variable, and then it picks up
a few associated variables.  The functions:
dev_getbyhwaddr
dev_getfirsthwbytype
dev_get_by_flags
dev_get_by_name
__dev_get_by_name
dev_get_by_index
__dev_get_by_index
dev_ioctl
dev_ethtool
dev_load
wireless_process_ioctl

were modified to take a network namespace argument, and
deal with it.

vlan_ioctl_set and brioctl_set were modified so their
hooks will receive a network namespace argument.

So basically anthing in the core of the network stack that was
affected to by the change of dev_base was modified to handle
multiple network namespaces.  The rest of the network stack was
simply modified to explicitly use &init_net the initial network
namespace.  This can be fixed when those components of the network
stack are modified to handle multiple network namespaces.

For now the ifindex generator is left global.

Fundametally ifindex numbers are per namespace, or else
we will have corner case problems with migration when
we get that far.

At the same time there are assumptions in the network stack
that the ifindex of a network device won't change.  Making
the ifindex number global seems a good compromise until
the network stack can cope with ifindex changes when
you change namespaces, and the like.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 20 insertions, 20 deletions

diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 83398da5d763..aabe98d9402f 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -751,7 +751,7 @@ static int dn_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
                 if (dn_ntohs(saddr->sdn_nodeaddrl)) {
                         read_lock(&dev_base_lock);
                         ldev = NULL;
-                        for_each_netdev(dev) {
+                        for_each_netdev(&init_net, dev) {
                                 if (!dev->dn_ptr)
                                         continue;
                                 if (dn_dev_islocal(dev, dn_saddr2dn(saddr))) {
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 83cb0761336a..ddfd2aff44d8 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -513,7 +513,7 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg)
         ifr->ifr_name[IFNAMSIZ-1] = 0;
 
 #ifdef CONFIG_KMOD
-        dev_load(ifr->ifr_name);
+        dev_load(&init_net, ifr->ifr_name);
 #endif
 
         switch(cmd) {
@@ -531,7 +531,7 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg)
 
         rtnl_lock();
 
-        if ((dev = __dev_get_by_name(ifr->ifr_name)) == NULL) {
+        if ((dev = __dev_get_by_name(&init_net, ifr->ifr_name)) == NULL) {
                 ret = -ENODEV;
                 goto done;
         }
@@ -629,7 +629,7 @@ static struct dn_dev *dn_dev_by_index(int ifindex)
 {
         struct net_device *dev;
         struct dn_dev *dn_dev = NULL;
-        dev = dev_get_by_index(ifindex);
+        dev = dev_get_by_index(&init_net, ifindex);
         if (dev) {
                 dn_dev = dev->dn_ptr;
                 dev_put(dev);
@@ -694,7 +694,7 @@ static int dn_nl_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
                 return -EINVAL;
 
         ifm = nlmsg_data(nlh);
-        if ((dev = __dev_get_by_index(ifm->ifa_index)) == NULL)
+        if ((dev = __dev_get_by_index(&init_net, ifm->ifa_index)) == NULL)
                 return -ENODEV;
 
         if ((dn_db = dev->dn_ptr) == NULL) {
@@ -800,7 +800,7 @@ static int dn_nl_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
         skip_naddr = cb->args[1];
 
         idx = 0;
-        for_each_netdev(dev) {
+        for_each_netdev(&init_net, dev) {
                 if (idx < skip_ndevs)
                         goto cont;
                 else if (idx > skip_ndevs) {
@@ -1297,7 +1297,7 @@ void dn_dev_devices_off(void)
         struct net_device *dev;
 
         rtnl_lock();
-        for_each_netdev(dev)
+        for_each_netdev(&init_net, dev)
                 dn_dev_down(dev);
         rtnl_unlock();
 
@@ -1308,7 +1308,7 @@ void dn_dev_devices_on(void)
         struct net_device *dev;
 
         rtnl_lock();
-        for_each_netdev(dev) {
+        for_each_netdev(&init_net, dev) {
                 if (dev->flags & IFF_UP)
                         dn_dev_up(dev);
         }
@@ -1342,7 +1342,7 @@ static void *dn_dev_seq_start(struct seq_file *seq, loff_t *pos)
                 return SEQ_START_TOKEN;
 
         i = 1;
-        for_each_netdev(dev) {
+        for_each_netdev(&init_net, dev) {
                 if (!is_dn_dev(dev))
                         continue;
 
@@ -1361,9 +1361,9 @@ static void *dn_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 
         dev = (struct net_device *)v;
         if (v == SEQ_START_TOKEN)
-                dev = net_device_entry(&dev_base_head);
+                dev = net_device_entry(&init_net.dev_base_head);
 
-        for_each_netdev_continue(dev) {
+        for_each_netdev_continue(&init_net, dev) {
                 if (!is_dn_dev(dev))
                         continue;
 
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c
index d2bc19d47950..3760a20d10d0 100644
--- a/net/decnet/dn_fib.c
+++ b/net/decnet/dn_fib.c
@@ -212,7 +212,7 @@ static int dn_fib_check_nh(const struct rtmsg *r, struct dn_fib_info *fi, struct
                                 return -EINVAL;
                         if (dnet_addr_type(nh->nh_gw) != RTN_UNICAST)
                                 return -EINVAL;
-                        if ((dev = __dev_get_by_index(nh->nh_oif)) == NULL)
+                        if ((dev = __dev_get_by_index(&init_net, nh->nh_oif)) == NULL)
                                 return -ENODEV;
                         if (!(dev->flags&IFF_UP))
                                 return -ENETDOWN;
@@ -255,7 +255,7 @@ out:
                 if (nh->nh_flags&(RTNH_F_PERVASIVE|RTNH_F_ONLINK))
                         return -EINVAL;
 
-                dev = __dev_get_by_index(nh->nh_oif);
+                dev = __dev_get_by_index(&init_net, nh->nh_oif);
                 if (dev == NULL || dev->dn_ptr == NULL)
                         return -ENODEV;
                 if (!(dev->flags&IFF_UP))
@@ -355,7 +355,7 @@ struct dn_fib_info *dn_fib_create_info(const struct rtmsg *r, struct dn_kern_rta
                 if (nhs != 1 || nh->nh_gw)
                         goto err_inval;
                 nh->nh_scope = RT_SCOPE_NOWHERE;
-                nh->nh_dev = dev_get_by_index(fi->fib_nh->nh_oif);
+                nh->nh_dev = dev_get_by_index(&init_net, fi->fib_nh->nh_oif);
                 err = -ENODEV;
                 if (nh->nh_dev == NULL)
                         goto failure;
@@ -602,7 +602,7 @@ static void dn_fib_del_ifaddr(struct dn_ifaddr *ifa)
 
         /* Scan device list */
         read_lock(&dev_base_lock);
-        for_each_netdev(dev) {
+        for_each_netdev(&init_net, dev) {
                 dn_db = dev->dn_ptr;
                 if (dn_db == NULL)
                         continue;
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 580e786d0c38..70b1c3fa00f3 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -908,7 +908,7 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old
 
         /* If we have an output interface, verify its a DECnet device */
         if (oldflp->oif) {
-                dev_out = dev_get_by_index(oldflp->oif);
+                dev_out = dev_get_by_index(&init_net, oldflp->oif);
                 err = -ENODEV;
                 if (dev_out && dev_out->dn_ptr == NULL) {
                         dev_put(dev_out);
@@ -929,7 +929,7 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old
                         goto out;
                 }
                 read_lock(&dev_base_lock);
-                for_each_netdev(dev) {
+                for_each_netdev(&init_net, dev) {
                         if (!dev->dn_ptr)
                                 continue;
                         if (!dn_dev_islocal(dev, oldflp->fld_src))
@@ -1556,7 +1556,7 @@ static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void
 
         if (fl.iif) {
                 struct net_device *dev;
-                if ((dev = dev_get_by_index(fl.iif)) == NULL) {
+                if ((dev = dev_get_by_index(&init_net, fl.iif)) == NULL) {
                         kfree_skb(skb);
                         return -ENODEV;
                 }
diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
index 52e40d7eb22d..ae354a43fb97 100644
--- a/net/decnet/sysctl_net_decnet.c
+++ b/net/decnet/sysctl_net_decnet.c
@@ -259,7 +259,7 @@ static int dn_def_dev_strategy(ctl_table *table, int __user *name, int nlen,
 
                 devname[newlen] = 0;
 
-                dev = dev_get_by_name(devname);
+                dev = dev_get_by_name(&init_net, devname);
                 if (dev == NULL)
                         return -ENODEV;
 
@@ -299,7 +299,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
                 devname[*lenp] = 0;
                 strip_it(devname);
 
-                dev = dev_get_by_name(devname);
+                dev = dev_get_by_name(&init_net, devname);
                 if (dev == NULL)
                         return -ENODEV;