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 --- time/clock_nanosleep.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'time') diff --git a/time/clock_nanosleep.c b/time/clock_nanosleep.c index f3230c4c90..5952d29195 100644 --- a/time/clock_nanosleep.c +++ b/time/clock_nanosleep.c @@ -24,8 +24,7 @@ int __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, struct timespec *rem) { - if (__builtin_expect (req->tv_nsec, 0) < 0 - || __builtin_expect (req->tv_nsec, 0) >= 1000000000) + if (! valid_nanoseconds (req->tv_nsec)) return EINVAL; if (flags != TIMER_ABSTIME && flags != 0) -- cgit v1.2.3-70-g09d2