1 files changed, 17 insertions, 49 deletions

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 6e447ff94dfa..10e15a144e95 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -217,8 +217,7 @@ void in_dev_finish_destroy(struct in_device *idev)
         WARN_ON(idev->ifa_list);
         WARN_ON(idev->mc_list);
 #ifdef NET_REFCNT_DEBUG
-        printk(KERN_DEBUG "in_dev_finish_destroy: %p=%s\n",
-               idev, dev ? dev->name : "NIL");
+        pr_debug("%s: %p=%s\n", __func__, idev, dev ? dev->name : "NIL");
 #endif
         dev_put(dev);
         if (!idev->dead)
@@ -1125,7 +1124,7 @@ skip:
         }
 }
 
-static inline bool inetdev_valid_mtu(unsigned mtu)
+static inline bool inetdev_valid_mtu(unsigned int mtu)
 {
         return mtu >= 68;
 }
@@ -1174,7 +1173,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,
 
         switch (event) {
         case NETDEV_REGISTER:
-                printk(KERN_DEBUG "inetdev_event: bug\n");
+                pr_debug("%s: bug\n", __func__);
                 RCU_INIT_POINTER(dev->ip_ptr, NULL);
                 break;
         case NETDEV_UP:
@@ -1266,17 +1265,15 @@ static int inet_fill_ifaddr(struct sk_buff *skb, struct in_ifaddr *ifa,
         ifm->ifa_scope = ifa->ifa_scope;
         ifm->ifa_index = ifa->ifa_dev->dev->ifindex;
 
-        if (ifa->ifa_address)
-                NLA_PUT_BE32(skb, IFA_ADDRESS, ifa->ifa_address);
-
-        if (ifa->ifa_local)
-                NLA_PUT_BE32(skb, IFA_LOCAL, ifa->ifa_local);
-
-        if (ifa->ifa_broadcast)
-                NLA_PUT_BE32(skb, IFA_BROADCAST, ifa->ifa_broadcast);
-
-        if (ifa->ifa_label[0])
-                NLA_PUT_STRING(skb, IFA_LABEL, ifa->ifa_label);
+        if ((ifa->ifa_address &&
+             nla_put_be32(skb, IFA_ADDRESS, ifa->ifa_address)) ||
+            (ifa->ifa_local &&
+             nla_put_be32(skb, IFA_LOCAL, ifa->ifa_local)) ||
+            (ifa->ifa_broadcast &&
+             nla_put_be32(skb, IFA_BROADCAST, ifa->ifa_broadcast)) ||
+            (ifa->ifa_label[0] &&
+             nla_put_string(skb, IFA_LABEL, ifa->ifa_label)))
+                goto nla_put_failure;
 
         return nlmsg_end(skb, nlh);
 
@@ -1587,7 +1584,6 @@ static int ipv4_doint_and_flush(ctl_table *ctl, int write,
 static struct devinet_sysctl_table {
         struct ctl_table_header *sysctl_header;
         struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
-        char *dev_name;
 } devinet_sysctl = {
         .devinet_vars = {
                 DEVINET_SYSCTL_COMPLEX_ENTRY(FORWARDING, "forwarding",
@@ -1629,16 +1625,7 @@ static int __devinet_sysctl_register(struct net *net, char *dev_name,
 {
         int i;
         struct devinet_sysctl_table *t;
-
-#define DEVINET_CTL_PATH_DEV    3
-
-        struct ctl_path devinet_ctl_path[] = {
-                { .procname = "net",  },
-                { .procname = "ipv4", },
-                { .procname = "conf", },
-                { /* to be set */ },
-                { },
-        };
+        char path[sizeof("net/ipv4/conf/") + IFNAMSIZ];
 
         t = kmemdup(&devinet_sysctl, sizeof(*t), GFP_KERNEL);
         if (!t)
@@ -1650,27 +1637,15 @@ static int __devinet_sysctl_register(struct net *net, char *dev_name,
                 t->devinet_vars[i].extra2 = net;
         }
 
-        /*
-         * Make a copy of dev_name, because '.procname' is regarded as const
-         * by sysctl and we wouldn't want anyone to change it under our feet
-         * (see SIOCSIFNAME).
-         */
-        t->dev_name = kstrdup(dev_name, GFP_KERNEL);
-        if (!t->dev_name)
-                goto free;
-
-        devinet_ctl_path[DEVINET_CTL_PATH_DEV].procname = t->dev_name;
+        snprintf(path, sizeof(path), "net/ipv4/conf/%s", dev_name);
 
-        t->sysctl_header = register_net_sysctl_table(net, devinet_ctl_path,
-                        t->devinet_vars);
+        t->sysctl_header = register_net_sysctl(net, path, t->devinet_vars);
         if (!t->sysctl_header)
-                goto free_procname;
+                goto free;
 
         p->sysctl = t;
         return 0;
 
-free_procname:
-        kfree(t->dev_name);
 free:
         kfree(t);
 out:
@@ -1686,7 +1661,6 @@ static void __devinet_sysctl_unregister(struct ipv4_devconf *cnf)
 
         cnf->sysctl = NULL;
         unregister_net_sysctl_table(t->sysctl_header);
-        kfree(t->dev_name);
         kfree(t);
 }
 
@@ -1716,12 +1690,6 @@ static struct ctl_table ctl_forward_entry[] = {
         },
         { },
 };
-
-static __net_initdata struct ctl_path net_ipv4_path[] = {
-        { .procname = "net", },
-        { .procname = "ipv4", },
-        { },
-};
 #endif
 
 static __net_init int devinet_init_net(struct net *net)
@@ -1767,7 +1735,7 @@ static __net_init int devinet_init_net(struct net *net)
                 goto err_reg_dflt;
 
         err = -ENOMEM;
-        forw_hdr = register_net_sysctl_table(net, net_ipv4_path, tbl);
+        forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
         if (forw_hdr == NULL)
                 goto err_reg_ctl;
         net->ipv4.forw_hdr = forw_hdr;