path: root/src/signal/siglongjmp.c
diff options
authorRich Felker <>2012-07-03 20:07:33 -0400
committerRich Felker <>2012-07-03 20:07:33 -0400
commitd6c0efe106b1016108207fb6872820c06dcef4f8 (patch)
tree700300d0b4ff576121241befdcf865678cde4e5c /src/signal/siglongjmp.c
parente6129e6d836e5f4725d9b14ba7457b32e24adc61 (diff)
jmp_buf overhaul fixing several issues
on arm, the location of the saved-signal-mask flag and mask were off by one between sigsetjmp and siglongjmp, causing incorrect behavior restoring the signal mask. this is because the siglongjmp code assumed an extra slot was in the non-sig jmp_buf for the flag, but arm did not have this. now, the extra slot is removed for all archs since it was useless. also, arm eabi requires jmp_buf to have 8-byte alignment. we achieve that using long long as the type rather than with non-portable gcc attribute tags.
Diffstat (limited to 'src/signal/siglongjmp.c')
1 files changed, 4 insertions, 5 deletions
diff --git a/src/signal/siglongjmp.c b/src/signal/siglongjmp.c
index 600d560c..9b4a5398 100644
--- a/src/signal/siglongjmp.c
+++ b/src/signal/siglongjmp.c
@@ -1,12 +1,11 @@
#include <setjmp.h>
#include <signal.h>
#include <stdlib.h>
+#include "syscall.h"
void siglongjmp(sigjmp_buf buf, int ret)
- unsigned long *flag = buf + sizeof(jmp_buf)/sizeof(long) - 1;
- sigset_t *mask = (void *)(flag + 1);
- if (*flag)
- sigprocmask (SIG_SETMASK, mask, NULL);
- longjmp((void *)buf, ret);
+ if (buf->__fl)
+ __syscall(SYS_rt_sigprocmask, SIG_SETMASK, buf->__ss, 0, 8);
+ longjmp(buf->__jb, ret);