mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

osf_wait4: switch to kernel_wait4()

Browse source 
... and sanitize copying rusage to userland

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2017-05-14 23:54:33 -04:00
parent 4c48abe91b
commit 92ebce5ac5
3 changed files with 19 additions and 42 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

55
arch/alpha/kernel/osf_sys.c
View file

@ -1183,48 +1183,23 @@ SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru)
SYSCALL_DEFINE4(osf_wait4, pid_t, pid, int __user *, ustatus, int, options, SYSCALL_DEFINE4(osf_wait4, pid_t, pid, int __user *, ustatus, int, options,
struct rusage32 __user *, ur) struct rusage32 __user *, ur)
{ {
struct rusage r;
long ret, err;
unsigned int status = 0; unsigned int status = 0;
mm_segment_t old_fs; struct rusage r;
long err = kernel_wait4(pid, &status, options, &r);
if (!ur) if (err <= 0)
return sys_wait4(pid, ustatus, options, NULL); return err;
if (put_user(status, ustatus))
old_fs = get_fs();
set_fs (KERNEL_DS);
ret = sys_wait4(pid, (unsigned int __user *) &status, options,
(struct rusage __user *) &r);
set_fs (old_fs);
if (!access_ok(VERIFY_WRITE, ur, sizeof(*ur)))
return -EFAULT; return -EFAULT;
if (!ur)
err = put_user(status, ustatus); return err;
if (ret < 0) if (put_tv32(&ur->ru_utime, &r.ru_utime))
return err ? err : ret; return -EFAULT;
if (put_tv32(&ur->ru_stime, &r.ru_stime))
err |= __put_user(r.ru_utime.tv_sec, &ur->ru_utime.tv_sec); return -EFAULT;
err |= __put_user(r.ru_utime.tv_usec, &ur->ru_utime.tv_usec); if (copy_to_user(&ur->ru_maxrss, &r.ru_maxrss,
err |= __put_user(r.ru_stime.tv_sec, &ur->ru_stime.tv_sec); sizeof(struct rusage32) - offsetof(struct rusage32, ru_maxrss)))
err |= __put_user(r.ru_stime.tv_usec, &ur->ru_stime.tv_usec); return -EFAULT;
err |= __put_user(r.ru_maxrss, &ur->ru_maxrss); return err;
err |= __put_user(r.ru_ixrss, &ur->ru_ixrss);
err |= __put_user(r.ru_idrss, &ur->ru_idrss);
err |= __put_user(r.ru_isrss, &ur->ru_isrss);
err |= __put_user(r.ru_minflt, &ur->ru_minflt);
err |= __put_user(r.ru_majflt, &ur->ru_majflt);
err |= __put_user(r.ru_nswap, &ur->ru_nswap);
err |= __put_user(r.ru_inblock, &ur->ru_inblock);
err |= __put_user(r.ru_oublock, &ur->ru_oublock);
err |= __put_user(r.ru_msgsnd, &ur->ru_msgsnd);
err |= __put_user(r.ru_msgrcv, &ur->ru_msgrcv);
err |= __put_user(r.ru_nsignals, &ur->ru_nsignals);
err |= __put_user(r.ru_nvcsw, &ur->ru_nvcsw);
err |= __put_user(r.ru_nivcsw, &ur->ru_nivcsw);
return err ? err : ret;
} }
/* /*

2
include/linux/sched/task.h
View file

@ -9,6 +9,7 @@
#include <linux/sched.h> #include <linux/sched.h>
struct task_struct; struct task_struct;
struct rusage;
union thread_union; union thread_union;
/* /*
@ -74,6 +75,7 @@ extern long _do_fork(unsigned long, unsigned long, unsigned long, int __user *,
extern long do_fork(unsigned long, unsigned long, unsigned long, int __user *, int __user *); extern long do_fork(unsigned long, unsigned long, unsigned long, int __user *, int __user *);
struct task_struct *fork_idle(int); struct task_struct *fork_idle(int);
extern pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); extern pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
extern long kernel_wait4(pid_t, int *, int, struct rusage *);
extern void free_task(struct task_struct *tsk); extern void free_task(struct task_struct *tsk);

4
kernel/exit.c
View file

@ -1639,8 +1639,8 @@ SYSCALL_DEFINE5(waitid, int, which, pid_t, upid, struct siginfo __user *,
return -EFAULT; return -EFAULT;
} }
static long kernel_wait4(pid_t upid, int __user *stat_addr, long kernel_wait4(pid_t upid, int __user *stat_addr, int options,
int options, struct rusage *ru) struct rusage *ru)
{ {
struct wait_opts wo; struct wait_opts wo;
struct pid *pid = NULL; struct pid *pid = NULL;