aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/exit.c
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2009-01-14 08:14:10 -0500
committerHeiko Carstens <heiko.carstens@de.ibm.com>2009-01-14 08:15:21 -0500
commit17da2bd90abf428523de0fb98f7075e00e3ed42e (patch)
tree4f2daf3cb792b7da62e6ae771b58902cc5ea24ab /kernel/exit.c
parent754fe8d297bfae7b77f7ce866e2fb0c5fb186506 (diff)
[CVE-2009-0029] System call wrappers part 08
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'kernel/exit.c')
-rw-r--r--kernel/exit.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 08895df0eab3..f80dec3f1875 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1754,9 +1754,8 @@ end:
1754 return retval; 1754 return retval;
1755} 1755}
1756 1756
1757asmlinkage long sys_waitid(int which, pid_t upid, 1757SYSCALL_DEFINE5(waitid, int, which, pid_t, upid, struct siginfo __user *,
1758 struct siginfo __user *infop, int options, 1758 infop, int, options, struct rusage __user *, ru)
1759 struct rusage __user *ru)
1760{ 1759{
1761 struct pid *pid = NULL; 1760 struct pid *pid = NULL;
1762 enum pid_type type; 1761 enum pid_type type;
@@ -1833,7 +1832,7 @@ SYSCALL_DEFINE4(wait4, pid_t, upid, int __user *, stat_addr,
1833 * sys_waitpid() remains for compatibility. waitpid() should be 1832 * sys_waitpid() remains for compatibility. waitpid() should be
1834 * implemented by calling sys_wait4() from libc.a. 1833 * implemented by calling sys_wait4() from libc.a.
1835 */ 1834 */
1836asmlinkage long sys_waitpid(pid_t pid, int __user *stat_addr, int options) 1835SYSCALL_DEFINE3(waitpid, pid_t, pid, int __user *, stat_addr, int, options)
1837{ 1836{
1838 return sys_wait4(pid, stat_addr, options, NULL); 1837 return sys_wait4(pid, stat_addr, options, NULL);
1839} 1838}