From: Rich Felker Date: Sat, 28 Feb 2015 04:25:45 +0000 (-0500) Subject: fix failure of internal futex __timedwait to report ECANCELED X-Git-Tag: v1.1.7~32 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=76ca7a5446a8aec2b671a401d5e1878c4704754e;p=oweals%2Fmusl.git fix failure of internal futex __timedwait to report ECANCELED as part of abstracting the futex wait, this function suppresses all futex error values which callers should not see using a whitelist approach. when the masked cancellation mode was added, the new ECANCELED error was not whitelisted. this omission caused the new pthread_cond_wait code using masked cancellation to exhibit a spurious wake (rather than acting on cancellation) when the request arrived after blocking on the cond var. --- diff --git a/src/thread/__timedwait.c b/src/thread/__timedwait.c index c9ec70cf..9b882b5a 100644 --- a/src/thread/__timedwait.c +++ b/src/thread/__timedwait.c @@ -33,7 +33,7 @@ int __timedwait(volatile int *addr, int val, r = -__syscall_cp(SYS_futex, addr, FUTEX_WAIT|priv, val, top); if (r == ENOSYS) r = -__syscall_cp(SYS_futex, addr, FUTEX_WAIT, val, top); - if (r != EINTR && r != ETIMEDOUT) r = 0; + if (r != EINTR && r != ETIMEDOUT && r != ECANCELED) r = 0; pthread_cleanup_pop(0); if (!cleanup) __pthread_setcancelstate(cs, 0);