projects
/
musl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
095ad15
)
fix rsyscall handler: must not clobber errno from signal context
author
Rich Felker
<dalias@aerifal.cx>
Wed, 6 Apr 2011 23:46:46 +0000
(19:46 -0400)
committer
Rich Felker
<dalias@aerifal.cx>
Wed, 6 Apr 2011 23:46:46 +0000
(19:46 -0400)
src/thread/pthread_create.c
patch
|
blob
|
history
diff --git
a/src/thread/pthread_create.c
b/src/thread/pthread_create.c
index
5248700
..
410eefc
100644
(file)
--- a/
src/thread/pthread_create.c
+++ b/
src/thread/pthread_create.c
@@
-89,6
+89,7
@@
static struct {
static void rsyscall_handler(int sig, siginfo_t *si, void *ctx)
{
struct pthread *self = __pthread_self();
static void rsyscall_handler(int sig, siginfo_t *si, void *ctx)
{
struct pthread *self = __pthread_self();
+ long r;
if (!rs.hold || rs.cnt == libc.threads_minus_1) return;
if (!rs.hold || rs.cnt == libc.threads_minus_1) return;
@@
-99,8
+100,9
@@
static void rsyscall_handler(int sig, siginfo_t *si, void *ctx)
return;
}
return;
}
- if (syscall(rs.nr, rs.arg[0], rs.arg[1], rs.arg[2],
- rs.arg[3], rs.arg[4], rs.arg[5]) < 0 && !rs.err) rs.err=errno;
+ r = __syscall(rs.nr, rs.arg[0], rs.arg[1],
+ rs.arg[2], rs.arg[3], rs.arg[4], rs.arg[5]);
+ if (r < 0) rs.err=-r;
a_inc(&rs.cnt);
__wake(&rs.cnt, 1, 1);
a_inc(&rs.cnt);
__wake(&rs.cnt, 1, 1);