diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index c92df986ff7..5a4fad2d3b5 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -2290,8 +2290,9 @@ linux_pselect6(struct thread *td, struct linux_pselect6_args *args) TIMEVAL_TO_TIMESPEC(&utv, &uts); - native_to_linux_timespec(<s, &uts); - error = copyout(<s, args->tsp, sizeof(lts)); + error = native_to_linux_timespec(<s, &uts); + if (error == 0) + error = copyout(<s, args->tsp, sizeof(lts)); } return (error); @@ -2343,8 +2344,9 @@ linux_ppoll(struct thread *td, struct linux_ppoll_args *args) } else timespecclear(&uts); - native_to_linux_timespec(<s, &uts); - error = copyout(<s, args->tsp, sizeof(lts)); + error = native_to_linux_timespec(<s, &uts); + if (error == 0) + error = copyout(<s, args->tsp, sizeof(lts)); } return (error); @@ -2438,7 +2440,9 @@ linux_sched_rr_get_interval(struct thread *td, PROC_UNLOCK(tdt->td_proc); if (error != 0) return (error); - native_to_linux_timespec(<s, &ts); + error = native_to_linux_timespec(<s, &ts); + if (error != 0) + return (error); return (copyout(<s, uap->interval, sizeof(lts))); } diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c index 2d293306ee6..c06cacc94eb 100644 --- a/sys/compat/linux/linux_time.c +++ b/sys/compat/linux/linux_time.c @@ -41,6 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp #include #include #include +#include #include #include #include @@ -118,16 +119,21 @@ LIN_SDT_PROBE_DEFINE1(time, linux_clock_nanosleep, unsupported_clockid, "int"); LIN_SDT_PROBE_DEFINE1(time, linux_clock_nanosleep, return, "int"); -void +int native_to_linux_timespec(struct l_timespec *ltp, struct timespec *ntp) { LIN_SDT_PROBE2(time, native_to_linux_timespec, entry, ltp, ntp); - +#ifdef COMPAT_LINUX32 + if (ntp->tv_sec > INT_MAX && + sizeof(ltp->tv_sec) != sizeof(ntp->tv_sec)) + return (EOVERFLOW); +#endif ltp->tv_sec = ntp->tv_sec; ltp->tv_nsec = ntp->tv_nsec; LIN_SDT_PROBE0(time, native_to_linux_timespec, return); + return (0); } int @@ -322,8 +328,9 @@ linux_clock_gettime(struct thread *td, struct linux_clock_gettime_args *args) LIN_SDT_PROBE1(time, linux_clock_gettime, return, error); return (error); } - native_to_linux_timespec(<s, &tp); - + error = native_to_linux_timespec(<s, &tp); + if (error != 0) + return (error); error = copyout(<s, args->tp, sizeof lts); if (error != 0) LIN_SDT_PROBE1(time, linux_clock_gettime, copyout_error, error); @@ -450,8 +457,9 @@ linux_clock_getres(struct thread *td, struct linux_clock_getres_args *args) LIN_SDT_PROBE1(time, linux_clock_getres, return, error); return (error); } - native_to_linux_timespec(<s, &ts); - + error = native_to_linux_timespec(<s, &ts); + if (error != 0) + return (error); error = copyout(<s, args->tp, sizeof lts); if (error != 0) LIN_SDT_PROBE1(time, linux_clock_getres, copyout_error, error); @@ -490,7 +498,9 @@ linux_nanosleep(struct thread *td, struct linux_nanosleep_args *args) } error = kern_nanosleep(td, &rqts, rmtp); if (args->rmtp != NULL) { - native_to_linux_timespec(&lrmts, rmtp); + error2 = native_to_linux_timespec(&lrmts, rmtp); + if (error2 != 0) + return (error2); error2 = copyout(&lrmts, args->rmtp, sizeof(lrmts)); if (error2 != 0) { LIN_SDT_PROBE1(time, linux_nanosleep, copyout_error, @@ -553,7 +563,9 @@ linux_clock_nanosleep(struct thread *td, struct linux_clock_nanosleep_args *args error = kern_nanosleep(td, &rqts, rmtp); if (args->rmtp != NULL) { /* XXX. Not for TIMER_ABSTIME */ - native_to_linux_timespec(&lrmts, rmtp); + error2 = native_to_linux_timespec(&lrmts, rmtp); + if (error2 != 0) + return (error2); error2 = copyout(&lrmts, args->rmtp, sizeof(lrmts)); if (error2 != 0) { LIN_SDT_PROBE1(time, linux_clock_nanosleep, diff --git a/sys/compat/linux/linux_timer.h b/sys/compat/linux/linux_timer.h index c79c08dc39f..e6f6b0a8643 100644 --- a/sys/compat/linux/linux_timer.h +++ b/sys/compat/linux/linux_timer.h @@ -111,7 +111,7 @@ struct l_itimerspec { struct l_timespec it_value; }; -void native_to_linux_timespec(struct l_timespec *, +int native_to_linux_timespec(struct l_timespec *, struct timespec *); int linux_to_native_timespec(struct timespec *, struct l_timespec *);