diff options
author | Ulrich Drepper <drepper@redhat.com> | 2003-06-01 04:09:55 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2003-06-01 04:09:55 +0000 |
commit | 31195be25b5cd8e88426ab2496eaeb4d508b0764 (patch) | |
tree | 22bb5835c3288f2530c8699a78855b050e1c47f7 /nptl | |
parent | 06e2e0a747504a9cce34fa851e7afac2dc8efe42 (diff) | |
download | glibc-31195be25b5cd8e88426ab2496eaeb4d508b0764.zip glibc-31195be25b5cd8e88426ab2496eaeb4d508b0764.tar.gz glibc-31195be25b5cd8e88426ab2496eaeb4d508b0764.tar.bz2 |
Update.
2003-05-31 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/ia64/bits/sigaction.h (SA_NOCLDWAIT): Define.
Diffstat (limited to 'nptl')
-rw-r--r-- | nptl/ChangeLog | 13 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h | 2 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/lowlevellock.c | 4 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.c | 2 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/s390/lowlevelmutex.c | 2 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c | 2 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sem_timedwait.c | 2 |
7 files changed, 20 insertions, 7 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index dc78ad8..cc9c94d 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,18 @@ 2003-05-31 Ulrich Drepper <drepper@redhat.com> + * sysdeps/unix/sysv/linux/lowlevellock.c (__lll_timedlock_wait): + Also fail if tv_nsec < 0. + (__lll_timedwait_tid): Likewise. + * sysdeps/unix/sysv/linux/sem_timedwait.c (sem_timedwait): Likewise. + * sysdeps/unix/sysv/linux/i386/lowlevellock.h (lll_timedwait_tid): + Likewise. + * sysdeps/unix/sysv/linux/s390/lowlevellock.c (___lll_timedwait_tid): + Likewise. + * sysdeps/unix/sysv/linux/s390/lowlevelmutex.c (__lll_mutex_timedlock): + Likewise. + * sysdeps/unix/sysv/linux/s390/sem_timedwait.c (sem_timedwait): + Likewise. + * Makefile (tests): Add tst-sem8 and tst-sem9. * tst-sem8.c: New file. * tst-sem9.c: New file. diff --git a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h index 8923afb..bd3fe4c 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +++ b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -337,7 +337,7 @@ extern int __lll_timedwait_tid (int *tid, const struct timespec *abstime) int __result = 0; \ if (tid != 0) \ { \ - if (abstime == NULL || abstime->tv_nsec >= 1000000000) \ + if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) \ __result = EINVAL; \ else \ __result = __lll_timedwait_tid (&tid, abstime); \ diff --git a/nptl/sysdeps/unix/sysv/linux/lowlevellock.c b/nptl/sysdeps/unix/sysv/linux/lowlevellock.c index eb3e689..ad7510a 100644 --- a/nptl/sysdeps/unix/sysv/linux/lowlevellock.c +++ b/nptl/sysdeps/unix/sysv/linux/lowlevellock.c @@ -44,7 +44,7 @@ int __lll_timedlock_wait (int *futex, int val, const struct timespec *abstime) { /* Reject invalid timeouts. */ - if (abstime->tv_nsec >= 1000000000) + if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) return EINVAL; do @@ -100,7 +100,7 @@ __lll_timedwait_tid (int *tidp, const struct timespec *abstime) { int tid; - if (abstime->tv_nsec >= 1000000000) + if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) return EINVAL; /* Repeat until thread terminated. */ diff --git a/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.c b/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.c index 60c39d0..6fedd2e 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.c @@ -64,7 +64,7 @@ ___lll_timedwait_tid (ptid, abstime) { int tid; - if (abstime == NULL || abstime->tv_nsec >= 1000000000) + if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) return EINVAL; /* Repeat until thread terminated. */ diff --git a/nptl/sysdeps/unix/sysv/linux/s390/lowlevelmutex.c b/nptl/sysdeps/unix/sysv/linux/s390/lowlevelmutex.c index d4d91db..380091c 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/lowlevelmutex.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/lowlevelmutex.c @@ -48,7 +48,7 @@ ___lll_mutex_timedlock (futex, abstime, newval) int newval; { /* Reject invalid timeouts. */ - if (abstime->tv_nsec >= 1000000000) + if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) return EINVAL; int oldval; diff --git a/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c b/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c index 42433de..273b541 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c @@ -43,7 +43,7 @@ sem_timedwait (sem, abstime) return 0; /* Check for invalid timeout values. */ - if (abstime->tv_nsec >= 1000000000) + if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) { __set_errno (EINVAL); return -1; diff --git a/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c b/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c index 632cce4..8a65ce2 100644 --- a/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c +++ b/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c @@ -42,7 +42,7 @@ sem_timedwait (sem_t *sem, const struct timespec *abstime) } err = -EINVAL; - if (abstime->tv_nsec >= 1000000000) + if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) goto error_return; do |