about summary refs log tree commit diff
path: root/io
diff options
context:
space:
mode:
authorLukasz Majewski <lukma@denx.de>2019-10-24 16:20:56 +0200
committerLukasz Majewski <lukma@denx.de>2019-10-27 21:49:25 +0100
commit48123656609fea92a154f08ab619ab5186276432 (patch)
tree34c399889dbe5271b30b7c840f9fd048875e704f /io
parent513aaa0d782f8fae36732d06ca59d658149f0139 (diff)
downloadglibc-48123656609fea92a154f08ab619ab5186276432.tar.gz
glibc-48123656609fea92a154f08ab619ab5186276432.tar.xz
glibc-48123656609fea92a154f08ab619ab5186276432.zip
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 <time.h> 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
Diffstat (limited to 'io')
-rw-r--r--io/ppoll.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/io/ppoll.c b/io/ppoll.c
index a387924eeb..6d156a8a46 100644
--- a/io/ppoll.c
+++ b/io/ppoll.c
@@ -22,6 +22,7 @@
 #include <stddef.h>	/* For NULL.  */
 #include <sys/poll.h>
 #include <sysdep-cancel.h>
+#include <time.h>
 
 
 int
@@ -33,8 +34,7 @@ ppoll (struct pollfd *fds, nfds_t nfds, const struct timespec *timeout,
   /* poll uses a simple millisecond value.  Convert it.  */
   if (timeout != NULL)
     {
-      if (timeout->tv_sec < 0
-	  || timeout->tv_nsec < 0 || timeout->tv_nsec >= 1000000000)
+      if (timeout->tv_sec < 0 || ! valid_nanoseconds (timeout->tv_nsec))
 	{
 	  __set_errno (EINVAL);
 	  return -1;