Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[safe/jmp/linux-2.6] / kernel / sysctl_binary.c

diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index 471438b..b75dbf4 100644 (file)
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -12,6 +12,7 @@
 #include <linux/pid_namespace.h>
 #include <linux/file.h>
 #include <linux/ctype.h>
+#include <linux/netdevice.h>
 
 #ifdef CONFIG_SYSCTL_SYSCALL
 
@@ -1250,9 +1251,12 @@ out:
 static const struct bin_table *get_sysctl(const int *name, int nlen, char *path)
 {
        const struct bin_table *table = &bin_root_table[0];
-       struct net *net = current->nsproxy->net_ns;
        int ctl_name;
 
+       /* The binary sysctl tables have a small maximum depth so
+        * there is no danger of overflowing our path as it PATH_MAX
+        * bytes long.
+        */
        memcpy(path, "sys/", 4);
        path += 4;
 
@@ -1263,30 +1267,30 @@ repeat:
        name++;
        nlen--;
        for ( ; table->convert; table++) {
-               struct net_device *dev = NULL;
-               const char *procname = NULL;
-
-               /* Use the well known sysctl number to proc name mapping */
-               if (ctl_name == table->ctl_name)
-                       procname = table->procname;
+               int len = 0;
 
                /*
                 * For a wild card entry map from ifindex to network
                 * device name.
                 */
-               else if (!table->ctl_name) {
+               if (!table->ctl_name) {
+#ifdef CONFIG_NET
+                       struct net *net = current->nsproxy->net_ns;
+                       struct net_device *dev;
                        dev = dev_get_by_index(net, ctl_name);
-                       if (dev)
-                               procname = dev->name;
+                       if (dev) {
+                               len = strlen(dev->name);
+                               memcpy(path, dev->name, len);
+                               dev_put(dev);
+                       }
+#endif
+               /* Use the well known sysctl number to proc name mapping */
+               } else if (ctl_name == table->ctl_name) {
+                       len = strlen(table->procname);
+                       memcpy(path, table->procname, len);
                }
-               if (procname) {
-                       int len;
-
-                       len = strlen(procname);
-                       memcpy(path, procname, len);
+               if (len) {
                        path += len;
-                       if (dev)
-                               dev_put(dev);
                        if (table->child) {
                                *path++ = '/';
                                table = table->child;
@@ -1393,15 +1397,9 @@ static ssize_t binary_sysctl(const int *name, int nlen,
 
 static void deprecated_sysctl_warning(const int *name, int nlen)
 {
-       static int msg_count;
        int i;
 
-       /* Ignore accesses to kernel.version */
-       if ((nlen == 2) && (name[0] == CTL_KERN) && (name[1] == KERN_VERSION))
-               return;
-
-       if (msg_count < 5) {
-               msg_count++;
+       if (printk_ratelimit()) {
                printk(KERN_INFO
                        "warning: process `%s' used the deprecated sysctl "
                        "system call with ", current->comm);