kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

waitid(): switch copyout of siginfo to unsafe_put_user()

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2017-05-14 19:27:32 -04:00
parent 76d9871e11
commit 4c48abe91b
1 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
kernel/exit.c
View file

@ -1625,15 +1625,18 @@ SYSCALL_DEFINE5(waitid, int, which, pid_t, upid, struct siginfo __user *,
if (!infop)
return err;
if (put_user(err ? 0 : SIGCHLD, &infop->si_signo) ||
put_user(0, &infop->si_errno) ||
put_user((short)info.cause, &infop->si_code) ||
put_user(info.pid, &infop->si_pid) ||
put_user(info.uid, &infop->si_uid) ||
put_user(info.status, &infop->si_status))
err = -EFAULT;
user_access_begin();
unsafe_put_user(err ? 0 : SIGCHLD, &infop->si_signo, Efault);
unsafe_put_user(0, &infop->si_errno, Efault);
unsafe_put_user((short)info.cause, &infop->si_code, Efault);
unsafe_put_user(info.pid, &infop->si_pid, Efault);
unsafe_put_user(info.uid, &infop->si_uid, Efault);
unsafe_put_user(info.status, &infop->si_status, Efault);
user_access_end();
return err;
Efault:
user_access_end();
return -EFAULT;
}
static long kernel_wait4(pid_t upid, int __user *stat_addr,
@ -1736,13 +1739,20 @@ COMPAT_SYSCALL_DEFINE5(waitid,
return -EFAULT;
}
if (put_user(err ? 0 : SIGCHLD, &infop->si_signo) ||
put_user(0, &infop->si_errno) ||
put_user((short)info.cause, &infop->si_code) ||
put_user(info.pid, &infop->si_pid) ||
put_user(info.uid, &infop->si_uid) ||
put_user(info.status, &infop->si_status))
err = -EFAULT;
if (!infop)
return err;
user_access_begin();
unsafe_put_user(err ? 0 : SIGCHLD, &infop->si_signo, Efault);
unsafe_put_user(0, &infop->si_errno, Efault);
unsafe_put_user((short)info.cause, &infop->si_code, Efault);
unsafe_put_user(info.pid, &infop->si_pid, Efault);
unsafe_put_user(info.uid, &infop->si_uid, Efault);
unsafe_put_user(info.status, &infop->si_status, Efault);
user_access_end();
return err;
Efault:
user_access_end();
return -EFAULT;
}
#endif