X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fexit%2Fabort.c;h=e1980f10a5b6488a8a82a98a6a987e6db7997e3b;hb=fe5e72ae782238038ba4eaa3e1889e7bd16fecec;hp=ecc0f735aaee71ca9324f537db1a6db1fb1e5897;hpb=0c8bc102f287d3993751d80ba2dffb01e0c8bc7f;p=musl

diff --git a/src/exit/abort.c b/src/exit/abort.c
index ecc0f735..e1980f10 100644
--- a/src/exit/abort.c
+++ b/src/exit/abort.c
@@ -3,11 +3,29 @@
 #include "syscall.h"
 #include "pthread_impl.h"
 #include "atomic.h"
+#include "lock.h"
+#include "ksigaction.h"
+
+hidden volatile int __abort_lock[1];
 
 _Noreturn void abort(void)
 {
 	raise(SIGABRT);
+
+	/* If there was a SIGABRT handler installed and it returned, or if
+	 * SIGABRT was blocked or ignored, take an AS-safe lock to prevent
+	 * sigaction from installing a new SIGABRT handler, uninstall any
+	 * handler that may be present, and re-raise the signal to generate
+	 * the default action of abnormal termination. */
 	__block_all_sigs(0);
+	LOCK(__abort_lock);
+	__syscall(SYS_rt_sigaction, SIGABRT,
+		&(struct k_sigaction){.handler = SIG_DFL}, 0, _NSIG/8);
+	__syscall(SYS_tkill, __pthread_self()->tid, SIGABRT);
+	__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
+		&(long[_NSIG/(8*sizeof(long))]){1UL<<(SIGABRT-1)}, 0, _NSIG/8);
+
+	/* Beyond this point should be unreachable. */
 	a_crash();
 	raise(SIGKILL);
 	_Exit(127);