diff options
| author | Lukasz Majewski <lukma@denx.de> | 2019-10-24 16:20:56 +0200 |
|---|---|---|
| committer | Lukasz Majewski <lukma@denx.de> | 2019-10-27 21:49:25 +0100 |
| commit | 48123656609fea92a154f08ab619ab5186276432 (patch) | |
| tree | 34c399889dbe5271b30b7c840f9fd048875e704f /sysdeps/unix | |
| parent | 513aaa0d782f8fae36732d06ca59d658149f0139 (diff) | |
| download | glibc-48123656609fea92a154f08ab619ab5186276432.tar.gz | |
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 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/clock_nanosleep.c | 3 | ||||
| -rw-r--r-- | sysdeps/unix/clock_settime.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/clock_settime.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/sysdeps/unix/clock_nanosleep.c b/sysdeps/unix/clock_nanosleep.c index 95b4956b12..8514a439ee 100644 --- a/sysdeps/unix/clock_nanosleep.c +++ b/sysdeps/unix/clock_nanosleep.c @@ -30,8 +30,7 @@ __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, { struct timespec now; - if (__builtin_expect (req->tv_nsec, 0) < 0 - || __builtin_expect (req->tv_nsec, 0) >= 1000000000) + if (! valid_nanoseconds (req->tv_nsec)) return EINVAL; if (clock_id == CLOCK_THREAD_CPUTIME_ID) diff --git a/sysdeps/unix/clock_settime.c b/sysdeps/unix/clock_settime.c index 18d7c99864..54c917949f 100644 --- a/sysdeps/unix/clock_settime.c +++ b/sysdeps/unix/clock_settime.c @@ -27,7 +27,7 @@ __clock_settime (clockid_t clock_id, const struct timespec *tp) int retval = -1; /* Make sure the time cvalue is OK. */ - if (tp->tv_nsec < 0 || tp->tv_nsec >= 1000000000) + if (! valid_nanoseconds (tp->tv_nsec)) { __set_errno (EINVAL); return -1; diff --git a/sysdeps/unix/sysv/linux/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c index 54999d3008..bda113809b 100644 --- a/sysdeps/unix/sysv/linux/clock_settime.c +++ b/sysdeps/unix/sysv/linux/clock_settime.c @@ -26,7 +26,7 @@ int __clock_settime64 (clockid_t clock_id, const struct __timespec64 *tp) { /* Make sure the time cvalue is OK. */ - if (tp->tv_nsec < 0 || tp->tv_nsec >= 1000000000) + if (! valid_nanoseconds (tp->tv_nsec)) { __set_errno (EINVAL); return -1; |