about summary refs log tree commit diff
path: root/nptl/pthread_rwlock_timedrdlock.c
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2019-06-24 12:39:02 +0000
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-07-12 13:36:24 +0000
commit600b4be4d9439aa0f107cd63760d9fc121432717 (patch)
treed9057988cc05c6391c3540d5a50fba1bbabca4b2 /nptl/pthread_rwlock_timedrdlock.c
parentafe4de7d283ebd88157126c5494ce1796194c16e (diff)
downloadglibc-600b4be4d9439aa0f107cd63760d9fc121432717.tar.gz
glibc-600b4be4d9439aa0f107cd63760d9fc121432717.tar.xz
glibc-600b4be4d9439aa0f107cd63760d9fc121432717.zip
nptl: pthread_rwlock: Move timeout validation into _full functions
As recommended by the comments in the implementations of
pthread_rwlock_timedrdlock and pthread_rwlock_timedwrlock, let's move
the timeout validity checks into the corresponding pthread_rwlock_rdlock_full
and pthread_rwlock_wrlock_full functions. Since these functions may be
called with abstime == NULL, an extra check for that is necessary too.

	* nptl/pthread_rwlock_common.c (__pthread_rwlock_rdlock_full):
	Check validity of abstime parameter.
	(__pthread_rwlock_rwlock_full): Likewise.
	* nptl/pthread_rwlock_timedrdlock.c
	* (pthread_rwlock_timedrdlock):
	Remove check for validity of abstime parameter.
	* nptl/pthread_rwlock_timedwrlock.c
	* (pthread_rwlock_timedwrlock):
	Likewise.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl/pthread_rwlock_timedrdlock.c')
-rw-r--r--nptl/pthread_rwlock_timedrdlock.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/nptl/pthread_rwlock_timedrdlock.c b/nptl/pthread_rwlock_timedrdlock.c
index aa0053094d..84c1983491 100644
--- a/nptl/pthread_rwlock_timedrdlock.c
+++ b/nptl/pthread_rwlock_timedrdlock.c
@@ -23,15 +23,5 @@ int
 pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock,
     const struct timespec *abstime)
 {
-  /* Make sure the passed in timeout value is valid.  Note that the previous
-     implementation assumed that this check *must* not be performed if there
-     would in fact be no blocking; however, POSIX only requires that "the
-     validity of the abstime parameter need not be checked if the lock can be
-     immediately acquired" (i.e., we need not but may check it).  */
-  /* ??? Just move this to __pthread_rwlock_rdlock_full?  */
-  if (__glibc_unlikely (abstime->tv_nsec >= 1000000000
-      || abstime->tv_nsec < 0))
-    return EINVAL;
-
   return __pthread_rwlock_rdlock_full (rwlock, abstime);
 }