[IPV4]: When possible test for IFF_LOOPBACK and not dev == loopback_dev

[net-next-2.6.git] / net / decnet / dn_route.c

diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index f2a61ef2af9cdebde1f5d217d09a8b74be9bc8c7..96fe0aa1638e43e544afe64b1b3dab06a8d44824 100644 (file)
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -77,6 +77,7 @@
 #include <linux/rcupdate.h>
 #include <linux/times.h>
 #include <asm/errno.h>
+#include <net/net_namespace.h>
 #include <net/netlink.h>
 #include <net/neighbour.h>
 #include <net/dst.h>
@@ -583,6 +584,9 @@ int dn_route_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type
        struct dn_dev *dn = (struct dn_dev *)dev->dn_ptr;
        unsigned char padlen = 0;
 
+       if (dev->nd_net != &init_net)
+               goto dump_it;
+
        if (dn == NULL)
                goto dump_it;
 
@@ -883,7 +887,7 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old
                                        .scope = RT_SCOPE_UNIVERSE,
                                     } },
                            .mark = oldflp->mark,
-                           .iif = loopback_dev.ifindex,
+                           .iif = loopback_dev->ifindex,
                            .oif = oldflp->oif };
        struct dn_route *rt = NULL;
        struct net_device *dev_out = NULL, *dev;
@@ -900,11 +904,11 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old
                       "dn_route_output_slow: dst=%04x src=%04x mark=%d"
                       " iif=%d oif=%d\n", dn_ntohs(oldflp->fld_dst),
                       dn_ntohs(oldflp->fld_src),
-                      oldflp->mark, loopback_dev.ifindex, oldflp->oif);
+                      oldflp->mark, loopback_dev->ifindex, oldflp->oif);
 
        /* 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);
@@ -925,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))
@@ -953,7 +957,7 @@ source_ok:
                err = -EADDRNOTAVAIL;
                if (dev_out)
                        dev_put(dev_out);
-               dev_out = &loopback_dev;
+               dev_out = loopback_dev;
                dev_hold(dev_out);
                if (!fl.fld_dst) {
                        fl.fld_dst =
@@ -962,7 +966,7 @@ source_ok:
                        if (!fl.fld_dst)
                                goto out;
                }
-               fl.oif = loopback_dev.ifindex;
+               fl.oif = loopback_dev->ifindex;
                res.type = RTN_LOCAL;
                goto make_route;
        }
@@ -1008,7 +1012,7 @@ source_ok:
                                        if (dev_out)
                                                dev_put(dev_out);
                                        if (dn_dev_islocal(neigh->dev, fl.fld_dst)) {
-                                               dev_out = &loopback_dev;
+                                               dev_out = loopback_dev;
                                                res.type = RTN_LOCAL;
                                        } else {
                                                dev_out = neigh->dev;
@@ -1029,7 +1033,7 @@ source_ok:
                /* Possible improvement - check all devices for local addr */
                if (dn_dev_islocal(dev_out, fl.fld_dst)) {
                        dev_put(dev_out);
-                       dev_out = &loopback_dev;
+                       dev_out = loopback_dev;
                        dev_hold(dev_out);
                        res.type = RTN_LOCAL;
                        goto select_source;
@@ -1065,7 +1069,7 @@ select_source:
                        fl.fld_src = fl.fld_dst;
                if (dev_out)
                        dev_put(dev_out);
-               dev_out = &loopback_dev;
+               dev_out = loopback_dev;
                dev_hold(dev_out);
                fl.oif = dev_out->ifindex;
                if (res.fi)
@@ -1552,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;
                }
@@ -1737,8 +1741,9 @@ static int dn_rt_cache_seq_open(struct inode *inode, struct file *file)
 {
        struct seq_file *seq;
        int rc = -ENOMEM;
-       struct dn_rt_cache_iter_state *s = kmalloc(sizeof(*s), GFP_KERNEL);
+       struct dn_rt_cache_iter_state *s;
 
+       s = kzalloc(sizeof(*s), GFP_KERNEL);
        if (!s)
                goto out;
        rc = seq_open(file, &dn_rt_cache_seq_ops);
@@ -1746,7 +1751,6 @@ static int dn_rt_cache_seq_open(struct inode *inode, struct file *file)
                goto out_kfree;
        seq             = file->private_data;
        seq->private    = s;
-       memset(s, 0, sizeof(*s));
 out:
        return rc;
 out_kfree:
@@ -1814,7 +1818,7 @@ void __init dn_route_init(void)
 
        dn_dst_ops.gc_thresh = (dn_rt_hash_mask + 1);
 
-       proc_net_fops_create("decnet_cache", S_IRUGO, &dn_rt_cache_seq_fops);
+       proc_net_fops_create(&init_net, "decnet_cache", S_IRUGO, &dn_rt_cache_seq_fops);
 
 #ifdef CONFIG_DECNET_ROUTER
        rtnl_register(PF_DECnet, RTM_GETROUTE, dn_cache_getroute, dn_fib_dump);
@@ -1829,6 +1833,6 @@ void __exit dn_route_cleanup(void)
        del_timer(&dn_route_timer);
        dn_run_flush(0);
 
-       proc_net_remove("decnet_cache");
+       proc_net_remove(&init_net, "decnet_cache");
 }