X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fenv%2F__stack_chk_fail.c;h=4de82fd9d2f39bd19bf71269b9530eae82552c4e;hb=d184a09e0529f33d8ddddb8825039133483a2c41;hp=bbba35118984a24bbb1a335d89abe2b424881309;hpb=60872cf9c93687e771c1b8bc41bb006bdcdc2e45;p=musl

diff --git a/src/env/__stack_chk_fail.c b/src/env/__stack_chk_fail.c
index bbba3511..4de82fd9 100644
--- a/src/env/__stack_chk_fail.c
+++ b/src/env/__stack_chk_fail.c
@@ -1,14 +1,23 @@
+#include <string.h>
+#include <stdint.h>
 #include "pthread_impl.h"
-#include "atomic.h"
 
-void __init_ssp(void)
+uintptr_t __stack_chk_guard;
+
+void __init_ssp(void *entropy)
 {
-#ifndef __PIC__
-	__pthread_self_init();
-#endif
+	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();
 }
+
+__attribute__((__visibility__("hidden")))
+void __stack_chk_fail_local(void);
+
+weak_alias(__stack_chk_fail, __stack_chk_fail_local);