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/mach | |
| 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 'sysdeps/mach')
| -rw-r--r-- | sysdeps/mach/hurd/htl/pt-hurd-cond-timedwait.c | 3 | ||||
| -rw-r--r-- | sysdeps/mach/nanosleep.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/mach/hurd/htl/pt-hurd-cond-timedwait.c b/sysdeps/mach/hurd/htl/pt-hurd-cond-timedwait.c index cf0de47bb5..aa3eb9884c 100644 --- a/sysdeps/mach/hurd/htl/pt-hurd-cond-timedwait.c +++ b/sysdeps/mach/hurd/htl/pt-hurd-cond-timedwait.c @@ -19,6 +19,7 @@ #include <pthread.h> #include <assert.h> #include <hurd/signal.h> +#include <time.h> #include <pt-internal.h> @@ -69,7 +70,7 @@ __pthread_hurd_cond_timedwait_internal (pthread_cond_t *cond, assert (ss->intr_port == MACH_PORT_NULL); /* Sanity check for signal bugs. */ - if (abstime != NULL && (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)) + if (abstime != NULL && ! valid_nanoseconds (abstime->tv_nsec)) return EINVAL; /* Atomically enqueue our thread on the condition variable's queue of diff --git a/sysdeps/mach/nanosleep.c b/sysdeps/mach/nanosleep.c index 67caa3ea8a..555251f842 100644 --- a/sysdeps/mach/nanosleep.c +++ b/sysdeps/mach/nanosleep.c @@ -30,8 +30,7 @@ __libc_nanosleep (const struct timespec *requested_time, struct timeval before, after; if (requested_time->tv_sec < 0 - || requested_time->tv_nsec < 0 - || requested_time->tv_nsec >= 1000000000) + || ! valid_nanoseconds (requested_time->tv_nsec)) { errno = EINVAL; return -1; |