From: Rich Felker Date: Tue, 19 Apr 2011 00:50:37 +0000 (-0400) Subject: recheck cancellation disabled flag after syscall returns EINTR X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;ds=sidebyside;h=be2e06d347fdb83e9c4f57e57fa29b78f6276a0c;hp=61b56a8d2151a60ec67a459a9d325b29c5dc3b41;p=musl 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. --- 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; }