Commit b6fe2d11 authored by Vitaly Mayatskikh's avatar Vitaly Mayatskikh Committed by Linus Torvalds

wait_noreap_copyout(): check for ->wo_info != NULL

Current behaviour of sys_waitid() looks odd.  If user passes infop ==
NULL, sys_waitid() returns success.  When user additionally specifies flag
WNOWAIT, sys_waitid() returns -EFAULT on the same conditions.  When user
combines WNOWAIT with WCONTINUED, sys_waitid() again returns success.

This patch adds check for ->wo_info in wait_noreap_copyout().

User-visible change: starting from this commit, sys_waitid() always checks
infop != NULL and does not fail if it is NULL.
Signed-off-by: default avatarVitaly Mayatskikh <v.mayatskih@gmail.com>
Reviewed-by: default avatarOleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dfe16dfa
...@@ -1140,18 +1140,20 @@ static int wait_noreap_copyout(struct wait_opts *wo, struct task_struct *p, ...@@ -1140,18 +1140,20 @@ static int wait_noreap_copyout(struct wait_opts *wo, struct task_struct *p,
put_task_struct(p); put_task_struct(p);
infop = wo->wo_info; infop = wo->wo_info;
if (!retval) if (infop) {
retval = put_user(SIGCHLD, &infop->si_signo); if (!retval)
if (!retval) retval = put_user(SIGCHLD, &infop->si_signo);
retval = put_user(0, &infop->si_errno); if (!retval)
if (!retval) retval = put_user(0, &infop->si_errno);
retval = put_user((short)why, &infop->si_code); if (!retval)
if (!retval) retval = put_user((short)why, &infop->si_code);
retval = put_user(pid, &infop->si_pid); if (!retval)
if (!retval) retval = put_user(pid, &infop->si_pid);
retval = put_user(uid, &infop->si_uid); if (!retval)
if (!retval) retval = put_user(uid, &infop->si_uid);
retval = put_user(status, &infop->si_status); if (!retval)
retval = put_user(status, &infop->si_status);
}
if (!retval) if (!retval)
retval = pid; retval = pid;
return retval; return retval;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment