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_rwlock_common.c | |
| parent | 513aaa0d782f8fae36732d06ca59d658149f0139 (diff) | |
| download | glibc-48123656609fea92a154f08ab619ab5186276432.tar glibc-48123656609fea92a154f08ab619ab5186276432.tar.gz glibc-48123656609fea92a154f08ab619ab5186276432.tar.bz2 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_rwlock_common.c')
| -rw-r--r-- | nptl/pthread_rwlock_common.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nptl/pthread_rwlock_common.c b/nptl/pthread_rwlock_common.c index 7070b9c2c8..9c05e03a09 100644 --- a/nptl/pthread_rwlock_common.c +++ b/nptl/pthread_rwlock_common.c @@ -24,6 +24,7 @@ #include <stap-probe.h> #include <atomic.h> #include <futex-internal.h> +#include <time.h> /* A reader--writer lock that fulfills the POSIX requirements (but operations @@ -290,8 +291,7 @@ __pthread_rwlock_rdlock_full (pthread_rwlock_t *rwlock, if the lock can be immediately acquired" (i.e., we need not but may check it). */ if (abstime && __glibc_unlikely (!futex_abstimed_supported_clockid (clockid) - || abstime->tv_nsec >= 1000000000 - || abstime->tv_nsec < 0)) + || ! valid_nanoseconds (abstime->tv_nsec))) return EINVAL; /* Make sure we are not holding the rwlock as a writer. This is a deadlock @@ -596,8 +596,7 @@ __pthread_rwlock_wrlock_full (pthread_rwlock_t *rwlock, if the lock can be immediately acquired" (i.e., we need not but may check it). */ if (abstime && __glibc_unlikely (!futex_abstimed_supported_clockid (clockid) - || abstime->tv_nsec >= 1000000000 - || abstime->tv_nsec < 0)) + || ! valid_nanoseconds (abstime->tv_nsec))) return EINVAL; /* Make sure we are not holding the rwlock as a writer. This is a deadlock |