1 files changed, 17 insertions, 20 deletions

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 21f71bf912d5..f282b26f63eb 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -64,7 +64,7 @@
 #include <net/rtnetlink.h>
 #include <net/net_namespace.h>
 
-struct ipv4_devconf ipv4_devconf = {
+static struct ipv4_devconf ipv4_devconf = {
         .data = {
                 [NET_IPV4_CONF_ACCEPT_REDIRECTS - 1] = 1,
                 [NET_IPV4_CONF_SEND_REDIRECTS - 1] = 1,
@@ -485,46 +485,41 @@ errout:
         return err;
 }
 
-static struct in_ifaddr *rtm_to_ifaddr(struct nlmsghdr *nlh)
+static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh)
 {
         struct nlattr *tb[IFA_MAX+1];
         struct in_ifaddr *ifa;
         struct ifaddrmsg *ifm;
         struct net_device *dev;
         struct in_device *in_dev;
-        int err = -EINVAL;
+        int err;
 
         err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv4_policy);
         if (err < 0)
                 goto errout;
 
         ifm = nlmsg_data(nlh);
-        if (ifm->ifa_prefixlen > 32 || tb[IFA_LOCAL] == NULL) {
-                err = -EINVAL;
+        err = -EINVAL;
+        if (ifm->ifa_prefixlen > 32 || tb[IFA_LOCAL] == NULL)
                 goto errout;
-        }
 
-        dev = __dev_get_by_index(&init_net, ifm->ifa_index);
-        if (dev == NULL) {
-                err = -ENODEV;
+        dev = __dev_get_by_index(net, ifm->ifa_index);
+        err = -ENODEV;
+        if (dev == NULL)
                 goto errout;
-        }
 
         in_dev = __in_dev_get_rtnl(dev);
-        if (in_dev == NULL) {
-                err = -ENOBUFS;
+        err = -ENOBUFS;
+        if (in_dev == NULL)
                 goto errout;
-        }
 
         ifa = inet_alloc_ifa();
-        if (ifa == NULL) {
+        if (ifa == NULL)
                 /*
                  * A potential indev allocation can be left alive, it stays
                  * assigned to its device and is destroy with it.
                  */
-                err = -ENOBUFS;
                 goto errout;
-        }
 
         ipv4_devconf_setall(in_dev);
         in_dev_hold(in_dev);
@@ -568,7 +563,7 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg
         if (net != &init_net)
                 return -EINVAL;
 
-        ifa = rtm_to_ifaddr(nlh);
+        ifa = rtm_to_ifaddr(net, nlh);
         if (IS_ERR(ifa))
                 return PTR_ERR(ifa);
 
@@ -1182,7 +1177,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
 
         s_ip_idx = ip_idx = cb->args[1];
         idx = 0;
-        for_each_netdev(&init_net, dev) {
+        for_each_netdev(net, dev) {
                 if (idx < s_idx)
                         goto cont;
                 if (idx > s_idx)
@@ -1216,7 +1211,9 @@ static void rtmsg_ifa(int event, struct in_ifaddr* ifa, struct nlmsghdr *nlh,
         struct sk_buff *skb;
         u32 seq = nlh ? nlh->nlmsg_seq : 0;
         int err = -ENOBUFS;
+        struct net *net;
 
+        net = ifa->ifa_dev->dev->nd_net;
         skb = nlmsg_new(inet_nlmsg_size(), GFP_KERNEL);
         if (skb == NULL)
                 goto errout;
@@ -1228,10 +1225,10 @@ static void rtmsg_ifa(int event, struct in_ifaddr* ifa, struct nlmsghdr *nlh,
                 kfree_skb(skb);
                 goto errout;
         }
-        err = rtnl_notify(skb, &init_net, pid, RTNLGRP_IPV4_IFADDR, nlh, GFP_KERNEL);
+        err = rtnl_notify(skb, net, pid, RTNLGRP_IPV4_IFADDR, nlh, GFP_KERNEL);
 errout:
         if (err < 0)
-                rtnl_set_sk_err(&init_net, RTNLGRP_IPV4_IFADDR, err);
+                rtnl_set_sk_err(net, RTNLGRP_IPV4_IFADDR, err);
 }
 
 #ifdef CONFIG_SYSCTL