compat sysinfo(2): don't bother with field-by-field copyout

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2020-02-18 22:43:15 -05:00
Родитель 8f3d9f3542
Коммит ce5155c4f8
1 изменённых файлов: 17 добавлений и 16 удалений

Просмотреть файл

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