From 48123656609fea92a154f08ab619ab5186276432 Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Thu, 24 Oct 2019 16:20:56 +0200 Subject: time: Introduce function to check correctness of nanoseconds value The valid_nanoseconds () static inline function has been introduced to check if nanoseconds value is in the correct range - greater or equal to zero and less than 1000000000. The explicit #include has been added to files where it was missing. The __syscall_slong_t type for ns has been used to avoid issues on x32. Tested with: - scripts/build-many-glibcs.py - make PARALLELMFLAGS="-j12" && make PARALLELMFLAGS="-j12" xcheck on x86_64 --- sysdeps/pthread/timer_settime.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sysdeps/pthread') diff --git a/sysdeps/pthread/timer_settime.c b/sysdeps/pthread/timer_settime.c index 3d20495283..0fad4b1983 100644 --- a/sysdeps/pthread/timer_settime.c +++ b/sysdeps/pthread/timer_settime.c @@ -41,10 +41,8 @@ timer_settime (timer_t timerid, int flags, const struct itimerspec *value, goto bail; } - if (value->it_interval.tv_nsec < 0 - || value->it_interval.tv_nsec >= 1000000000 - || value->it_value.tv_nsec < 0 - || value->it_value.tv_nsec >= 1000000000) + if (! valid_nanoseconds (value->it_interval.tv_nsec) + || ! valid_nanoseconds (value->it_value.tv_nsec)) { __set_errno (EINVAL); goto bail; -- cgit 1.4.1