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 --- nptl/pthread_join_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nptl/pthread_join_common.c') diff --git a/nptl/pthread_join_common.c b/nptl/pthread_join_common.c index 9545ae4bd3..8b55c380e9 100644 --- a/nptl/pthread_join_common.c +++ b/nptl/pthread_join_common.c @@ -19,6 +19,7 @@ #include "pthreadP.h" #include #include +#include static void cleanup (void *arg) @@ -40,7 +41,7 @@ timedwait_tid (pid_t *tidp, const struct timespec *abstime) { pid_t tid; - if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) + if (! valid_nanoseconds (abstime->tv_nsec)) return EINVAL; /* Repeat until thread terminated. */ -- cgit 1.4.1