Merge branch 'akpm' (patches from Andrew)

[openwrt/staging/blogic.git] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index 180a2fa33f7fe4210bd6a34c11e3aa83d7a0224a..891667a49bb78496f18f5d9256ef9dfe23604895 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2634,6 +2634,7 @@ struct compat_sysinfo {
 COMPAT_SYSCALL_DEFINE1(sysinfo, struct compat_sysinfo __user *, info)
 {
        struct sysinfo s;
+       struct compat_sysinfo s_32;
 
        do_sysinfo(&s);
 
@@ -2658,23 +2659,23 @@ COMPAT_SYSCALL_DEFINE1(sysinfo, struct compat_sysinfo __user *, info)
                s.freehigh >>= bitcount;
        }
 
-       if (!access_ok(info, sizeof(struct compat_sysinfo)) ||
-           __put_user(s.uptime, &info->uptime) ||
-           __put_user(s.loads[0], &info->loads[0]) ||
-           __put_user(s.loads[1], &info->loads[1]) ||
-           __put_user(s.loads[2], &info->loads[2]) ||
-           __put_user(s.totalram, &info->totalram) ||
-           __put_user(s.freeram, &info->freeram) ||
-           __put_user(s.sharedram, &info->sharedram) ||
-           __put_user(s.bufferram, &info->bufferram) ||
-           __put_user(s.totalswap, &info->totalswap) ||
-           __put_user(s.freeswap, &info->freeswap) ||
-           __put_user(s.procs, &info->procs) ||
-           __put_user(s.totalhigh, &info->totalhigh) ||
-           __put_user(s.freehigh, &info->freehigh) ||
-           __put_user(s.mem_unit, &info->mem_unit))
+       memset(&s_32, 0, sizeof(s_32));
+       s_32.uptime = s.uptime;
+       s_32.loads[0] = s.loads[0];
+       s_32.loads[1] = s.loads[1];
+       s_32.loads[2] = s.loads[2];
+       s_32.totalram = s.totalram;
+       s_32.freeram = s.freeram;
+       s_32.sharedram = s.sharedram;
+       s_32.bufferram = s.bufferram;
+       s_32.totalswap = s.totalswap;
+       s_32.freeswap = s.freeswap;
+       s_32.procs = s.procs;
+       s_32.totalhigh = s.totalhigh;
+       s_32.freehigh = s.freehigh;
+       s_32.mem_unit = s.mem_unit;
+       if (copy_to_user(info, &s_32, sizeof(s_32)))
                return -EFAULT;
-
        return 0;
 }
 #endif /* CONFIG_COMPAT */