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 --- io/ppoll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'io') diff --git a/io/ppoll.c b/io/ppoll.c index a387924..6d156a8 100644 --- a/io/ppoll.c +++ b/io/ppoll.c @@ -22,6 +22,7 @@ #include /* For NULL. */ #include #include +#include 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; -- cgit v1.1