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 /nptl/pthread_mutex_timedlock.c | |
| parent | 513aaa0d782f8fae36732d06ca59d658149f0139 (diff) | |
| download | glibc-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 'nptl/pthread_mutex_timedlock.c')
| -rw-r--r-- | nptl/pthread_mutex_timedlock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c index a0ce044dd4..c9bb3b9176 100644 --- a/nptl/pthread_mutex_timedlock.c +++ b/nptl/pthread_mutex_timedlock.c @@ -235,7 +235,7 @@ __pthread_mutex_clocklock_common (pthread_mutex_t *mutex, } /* We are about to block; check whether the timeout is invalid. */ - if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) + if (! valid_nanoseconds (abstime->tv_nsec)) return EINVAL; /* Work around the fact that the kernel rejects negative timeout values despite them being valid. */ @@ -561,7 +561,7 @@ __pthread_mutex_clocklock_common (pthread_mutex_t *mutex, if (oldval != ceilval) { /* Reject invalid timeouts. */ - if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) + if (! valid_nanoseconds (abstime->tv_nsec)) { result = EINVAL; goto failpp; |