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/htl | |
| 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 'sysdeps/htl')
| -rw-r--r-- | sysdeps/htl/pt-cond-timedwait.c | 3 | ||||
| -rw-r--r-- | sysdeps/htl/pt-mutex-timedlock.c | 3 | ||||
| -rw-r--r-- | sysdeps/htl/pt-rwlock-timedrdlock.c | 3 | ||||
| -rw-r--r-- | sysdeps/htl/pt-rwlock-timedwrlock.c | 3 | ||||
| -rw-r--r-- | sysdeps/htl/sem-timedwait.c | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/sysdeps/htl/pt-cond-timedwait.c b/sysdeps/htl/pt-cond-timedwait.c index cc5a9db37f..ff5631f7ab 100644 --- a/sysdeps/htl/pt-cond-timedwait.c +++ b/sysdeps/htl/pt-cond-timedwait.c @@ -20,6 +20,7 @@ #include <pt-internal.h> #include <pthreadP.h> +#include <time.h> extern int __pthread_cond_timedwait_internal (pthread_cond_t *cond, pthread_mutex_t *mutex, @@ -74,7 +75,7 @@ __pthread_cond_timedwait_internal (pthread_cond_t *cond, int cancelled, oldtype, drain; clockid_t clock_id = __pthread_default_condattr.__clock; - if (abstime && (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)) + if (abstime && ! valid_nanoseconds (abstime->tv_nsec)) return EINVAL; struct __pthread *self = _pthread_self (); diff --git a/sysdeps/htl/pt-mutex-timedlock.c b/sysdeps/htl/pt-mutex-timedlock.c index c8fe022613..c378557f49 100644 --- a/sysdeps/htl/pt-mutex-timedlock.c +++ b/sysdeps/htl/pt-mutex-timedlock.c @@ -18,6 +18,7 @@ #include <pthread.h> #include <assert.h> +#include <time.h> #include <pt-internal.h> @@ -119,7 +120,7 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex, #endif assert (mutex->__owner); - if (abstime != NULL && (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)) + if (abstime != NULL && ! valid_nanoseconds (abstime->tv_nsec)) return EINVAL; /* Add ourselves to the queue. */ diff --git a/sysdeps/htl/pt-rwlock-timedrdlock.c b/sysdeps/htl/pt-rwlock-timedrdlock.c index cdae8dfd3a..d64c7a7390 100644 --- a/sysdeps/htl/pt-rwlock-timedrdlock.c +++ b/sysdeps/htl/pt-rwlock-timedrdlock.c @@ -18,6 +18,7 @@ #include <pthread.h> #include <assert.h> +#include <time.h> #include <pt-internal.h> @@ -60,7 +61,7 @@ __pthread_rwlock_timedrdlock_internal (struct __pthread_rwlock *rwlock, /* Better be blocked by a writer. */ assert (rwlock->__readers == 0); - if (abstime != NULL && (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)) + if (abstime != NULL && ! valid_nanoseconds (abstime->tv_nsec)) return EINVAL; self = _pthread_self (); diff --git a/sysdeps/htl/pt-rwlock-timedwrlock.c b/sysdeps/htl/pt-rwlock-timedwrlock.c index 83a022afed..2316321d79 100644 --- a/sysdeps/htl/pt-rwlock-timedwrlock.c +++ b/sysdeps/htl/pt-rwlock-timedwrlock.c @@ -18,6 +18,7 @@ #include <pthread.h> #include <assert.h> +#include <time.h> #include <pt-internal.h> @@ -46,7 +47,7 @@ __pthread_rwlock_timedwrlock_internal (struct __pthread_rwlock *rwlock, /* The lock is busy. */ - if (abstime != NULL && (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)) + if (abstime != NULL && ! valid_nanoseconds (abstime->tv_nsec)) return EINVAL; self = _pthread_self (); diff --git a/sysdeps/htl/sem-timedwait.c b/sysdeps/htl/sem-timedwait.c index e2eeff4b8a..dfb0cb99d3 100644 --- a/sysdeps/htl/sem-timedwait.c +++ b/sysdeps/htl/sem-timedwait.c @@ -19,6 +19,7 @@ #include <semaphore.h> #include <errno.h> #include <assert.h> +#include <time.h> #include <pt-internal.h> @@ -39,7 +40,7 @@ __sem_timedwait_internal (sem_t *restrict sem, return 0; } - if (timeout != NULL && (timeout->tv_nsec < 0 || timeout->tv_nsec >= 1000000000)) + if (timeout != NULL && ! valid_nanoseconds (timeout->tv_nsec)) { errno = EINVAL; return -1; |