diff options
Diffstat (limited to 'src/thread')
| -rw-r--r-- | src/thread/__timedwait.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/thread/__timedwait.c b/src/thread/__timedwait.c index 229db313..ae19bd63 100644 --- a/src/thread/__timedwait.c +++ b/src/thread/__timedwait.c @@ -5,6 +5,9 @@ #include "syscall.h" #include "pthread_impl.h" +static volatile int dummy = 0; +weak_alias(dummy, __eintr_valid_flag); + int __timedwait_cp(volatile int *addr, int val, clockid_t clk, const struct timespec *at, int priv) { @@ -28,6 +31,11 @@ int __timedwait_cp(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 != ECANCELED) r = 0; + /* Mitigate bug in old kernels wrongly reporting EINTR for non- + * interrupting (SA_RESTART) signal handlers. This is only practical + * when NO interrupting signal handlers have been installed, and + * works by sigaction tracking whether that's the case. */ + if (r == EINTR && !__eintr_valid_flag) r = 0; return r; } |