[PATCH][COMPAT] {get,put}_compat_timspec 5/8 ia64

Stephen Rothwell (sfr@canb.auug.org.au)
Wed, 8 Jan 2003 23:01:01 +1100


Hi David,

Here is the ia64 part.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff -ruN 2.5.54-200301081106-32bit.2/arch/ia64/ia32/ia32_signal.c 2.5.54-200301081106-32bit.3/arch/ia64/ia32/ia32_signal.c --- 2.5.54-200301081106-32bit.2/arch/ia64/ia32/ia32_signal.c 2002-12-27 15:15:38.000000000 +1100 +++ 2.5.54-200301081106-32bit.3/arch/ia64/ia32/ia32_signal.c 2003-01-08 17:05:48.000000000 +1100 @@ -607,14 +607,11 @@ if (copy_from_user(&s.sig, uthese, sizeof(sigset32_t))) return -EFAULT; - if (uts) { - ret = get_user(t.tv_sec, &uts->tv_sec); - ret |= get_user(t.tv_nsec, &uts->tv_nsec); - if (ret) - return -EFAULT; - } + if (uts && get_compat_timespec(&t, uts)) + return -EFAULT; set_fs(KERNEL_DS); - ret = sys_rt_sigtimedwait(&s, &info, &t, sigsetsize); + ret = sys_rt_sigtimedwait(&s, uinfo ? &info : NULL, uts ? &t : NULL, + sigsetsize); set_fs(old_fs); if (ret >= 0 && uinfo) { if (copy_siginfo_to_user32(uinfo, &info)) diff -ruN 2.5.54-200301081106-32bit.2/arch/ia64/ia32/sys_ia32.c 2.5.54-200301081106-32bit.3/arch/ia64/ia32/sys_ia32.c --- 2.5.54-200301081106-32bit.2/arch/ia64/ia32/sys_ia32.c 2003-01-08 12:03:33.000000000 +1100 +++ 2.5.54-200301081106-32bit.3/arch/ia64/ia32/sys_ia32.c 2003-01-08 17:08:05.000000000 +1100 @@ -3536,7 +3536,7 @@ set_fs(KERNEL_DS); ret = sys_sched_rr_get_interval(pid, &t); set_fs(old_fs); - if (put_user (t.tv_sec, &interval->tv_sec) || put_user (t.tv_nsec, &interval->tv_nsec)) + if (put_compat_timespec(&t, interval)) return -EFAULT; return ret; } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/