From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 19 Apr 2011 00:50:37 +0000 (-0400)
Subject: recheck cancellation disabled flag after syscall returns EINTR
X-Git-Tag: v0.7.9~27
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=be2e06d347fdb83e9c4f57e57fa29b78f6276a0c;p=oweals%2Fmusl.git

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;
 }