path: root/src
diff options
authorRich Felker <>2011-04-18 20:50:37 -0400
committerRich Felker <>2011-04-18 20:50:37 -0400
commitbe2e06d347fdb83e9c4f57e57fa29b78f6276a0c (patch)
tree50a11b3a75d17a6c2da781804c0a03165899ee3d /src
parent61b56a8d2151a60ec67a459a9d325b29c5dc3b41 (diff)
recheck cancellation disabled flag after syscall returns EINTR
we already checked before making the syscall, but it's possible that a signal handler interrupted the blocking syscall and disabled cancellation, and that this is the cause of EINTR. in this case, the old behavior was testably wrong.
Diffstat (limited to 'src')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/thread/cancel_impl.c b/src/thread/cancel_impl.c
index 1f4ff90c..0d80885f 100644
--- a/src/thread/cancel_impl.c
+++ b/src/thread/cancel_impl.c
@@ -27,7 +27,7 @@ long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
r = __syscall_cp_asm(&self->cp_sp, nr, u, v, w, x, y, z);
self->cp_ip = old_ip;
self->cp_sp = old_sp;
- if (r == -EINTR && self->cancel) __cancel();
+ if (r == -EINTR && self->cancel && !self->canceldisable) __cancel();
return r;