diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-02-22 23:38:53 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-02-22 23:38:53 +0000 |
| commit | 5d2f248a5f3acac4b763439327c92091be7abb1c (patch) | |
| tree | 8f30098a6d17c0367adfbb780e5a8d9a5c43ad5a /arch/mips/kernel/linux32.c | |
| parent | a048d7a8704b35ff6372fdf5eedd4533f37b1885 (diff) | |
| parent | 9e956c2dac9bec602ed1ba29181b45ba6d2b6448 (diff) | |
| download | kernel_samsung_espresso10-5d2f248a5f3acac4b763439327c92091be7abb1c.zip kernel_samsung_espresso10-5d2f248a5f3acac4b763439327c92091be7abb1c.tar.gz kernel_samsung_espresso10-5d2f248a5f3acac4b763439327c92091be7abb1c.tar.bz2 | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/mips/kernel/linux32.c')
| -rw-r--r-- | arch/mips/kernel/linux32.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 60353f5..5f68b22 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c @@ -230,6 +230,9 @@ sysn32_waitid(int which, compat_pid_t pid, long ret; mm_segment_t old_fs = get_fs(); + if (!access_ok(VERIFY_WRITE, uinfo, sizeof(*uinfo))) + return -EFAULT; + set_fs (KERNEL_DS); ret = sys_waitid(which, pid, uinfo, options, uru ? (struct rusage __user *) &ru : NULL); @@ -1450,25 +1453,6 @@ sys32_timer_create(u32 clock, struct sigevent32 __user *se32, timer_t __user *ti return sys_timer_create(clock, p, timer_id); } -asmlinkage long -sysn32_rt_sigtimedwait(const sigset_t __user *uthese, - siginfo_t __user *uinfo, - const struct compat_timespec __user *uts32, - size_t sigsetsize) -{ - struct timespec __user *uts = NULL; - - if (uts32) { - struct timespec ts; - uts = compat_alloc_user_space(sizeof(struct timespec)); - if (get_user(ts.tv_sec, &uts32->tv_sec) || - get_user(ts.tv_nsec, &uts32->tv_nsec) || - copy_to_user (uts, &ts, sizeof (ts))) - return -EFAULT; - } - return sys_rt_sigtimedwait(uthese, uinfo, uts, sigsetsize); -} - save_static_function(sys32_clone); __attribute_used__ noinline static int _sys32_clone(nabi_no_regargs struct pt_regs regs) |