defer free of thread-local dlerror buffers from inconsistent context

[musl] / src / env / __stack_chk_fail.c

diff --git a/src/env/__stack_chk_fail.c b/src/env/__stack_chk_fail.c
index eac852b..e32596d 100644 (file)
--- a/src/env/__stack_chk_fail.c
+++ b/src/env/__stack_chk_fail.c
@@ -1,24 +1,22 @@
 #include <string.h>
-#include <inttypes.h>
-#include <elf.h>
+#include <stdint.h>
 #include "pthread_impl.h"
-#include "atomic.h"
 
 uintptr_t __stack_chk_guard;
 
-void __init_ssp(size_t *auxv)
+void __init_ssp(void *entropy)
 {
-       size_t i;
-       pthread_t self = __pthread_self_init();
-       uintptr_t canary;
-       for (i=0; auxv[i] && auxv[i]!=AT_RANDOM; i+=2);
-       if (auxv[i]) memcpy(&canary, (void *)auxv[i+1], sizeof canary);
-       else canary = (uintptr_t)&canary * 1103515245;
-       a_cas_l(&__stack_chk_guard, 0, canary);
-       self->canary = __stack_chk_guard;
+       if (entropy) memcpy(&__stack_chk_guard, entropy, sizeof(uintptr_t));
+       else __stack_chk_guard = (uintptr_t)&__stack_chk_guard * 1103515245;
+
+       __pthread_self()->CANARY = __stack_chk_guard;
 }
 
 void __stack_chk_fail(void)
 {
        a_crash();
 }
+
+hidden void __stack_chk_fail_local(void);
+
+weak_alias(__stack_chk_fail, __stack_chk_fail_local);