about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorYunQiang Su <yunqiang.su@cipunited.com>2022-11-08 12:49:46 +0800
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-11-17 14:35:13 -0300
commita9acb7b39ed21386142b963aeecc35e0b468c0de (patch)
tree0c77b1e8f3dcc46a1a0e13d8938bac571e636be2 /nptl
parent94628de77888c3292fc103840731ff85f283368e (diff)
downloadglibc-a9acb7b39ed21386142b963aeecc35e0b468c0de.tar.gz
glibc-a9acb7b39ed21386142b963aeecc35e0b468c0de.tar.xz
glibc-a9acb7b39ed21386142b963aeecc35e0b468c0de.zip
Define in_int32_t_range to check if the 64 bit time_t syscall should be used
Currently glibc uses in_time_t_range to detects time_t overflow,
and if it occurs fallbacks to 64 bit syscall version.

The function name is confusing because internally time_t might be
either 32 bits or 64 bits (depending on __TIMESIZE).

This patch refactors the in_time_t_range by replacing it with
in_int32_t_range for the case to check if the 64 bit time_t syscall
should be used.

The in_time_t range is used to detect overflow of the
syscall return value.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl')
-rw-r--r--nptl/futex-internal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nptl/futex-internal.c b/nptl/futex-internal.c
index 7ec228e8fb..6b8ac2304d 100644
--- a/nptl/futex-internal.c
+++ b/nptl/futex-internal.c
@@ -87,7 +87,7 @@ __futex_abstimed_wait_common (unsigned int* futex_word,
   err = __futex_abstimed_wait_common64 (futex_word, expected, op, abstime,
 					private, cancel);
 #else
-  bool need_time64 = abstime != NULL && !in_time_t_range (abstime->tv_sec);
+  bool need_time64 = abstime != NULL && !in_int32_t_range (abstime->tv_sec);
   if (need_time64)
     {
       err = __futex_abstimed_wait_common64 (futex_word, expected, op, abstime,
@@ -162,7 +162,7 @@ __futex_lock_pi64 (int *futex_word, clockid_t clockid,
 # ifdef __ASSUME_TIME64_SYSCALLS
   err = INTERNAL_SYSCALL_CALL (futex_time64, futex_word, op_pi, 0, abstime);
 # else
-  bool need_time64 = abstime != NULL && !in_time_t_range (abstime->tv_sec);
+  bool need_time64 = abstime != NULL && !in_int32_t_range (abstime->tv_sec);
   if (need_time64)
     err = INTERNAL_SYSCALL_CALL (futex_time64, futex_word, op_pi, 0, abstime);
   else