* [COMMITTED] nptl: Fix __futex_abstimed_wait_cancellable32
@ 2020-09-28 19:18 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2020-09-28 19:18 UTC (permalink / raw)
To: libc-alpha
Similar to 64-bit time __futex_abstimed_wait_cancellable64, it should
check for overflow and convert to 32-bit timespec iff timeout is not
NULL.
It fixes some regression on i686-linux-gnu running on a 4.15 kernel.
---
sysdeps/nptl/futex-internal.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/sysdeps/nptl/futex-internal.c b/sysdeps/nptl/futex-internal.c
index adb3c20611..1594cb6166 100644
--- a/sysdeps/nptl/futex-internal.c
+++ b/sysdeps/nptl/futex-internal.c
@@ -29,16 +29,22 @@ __futex_abstimed_wait_cancellable32 (unsigned int* futex_word,
const struct __timespec64* abstime,
int private)
{
- if (! in_time_t_range (abstime->tv_sec))
- return -EOVERFLOW;
+ struct timespec ts32, *pts32 = NULL;
+ if (abstime != NULL)
+ {
+ if (! in_time_t_range (abstime->tv_sec))
+ return -EOVERFLOW;
+
+ ts32 = valid_timespec64_to_timespec (*abstime);
+ pts32 = &ts32;
+ }
unsigned int clockbit = (clockid == CLOCK_REALTIME)
? FUTEX_CLOCK_REALTIME : 0;
int op = __lll_private_flag (FUTEX_WAIT_BITSET | clockbit, private);
- struct timespec ts32 = valid_timespec64_to_timespec (*abstime);
return INTERNAL_SYSCALL_CANCEL (futex, futex_word, op, expected,
- &ts32, NULL /* Unused. */,
+ pts32, NULL /* Unused. */,
FUTEX_BITSET_MATCH_ANY);
}
#endif
--
2.25.1
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-09-28 19:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-28 19:18 [COMMITTED] nptl: Fix __futex_abstimed_wait_cancellable32 Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).