X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fenv%2F__stack_chk_fail.c;h=e32596d10fff84a89a73cab4c0d84c26101769af;hb=4bbd7baea7c8538b3fb8e30f7b022a1eee071450;hp=00634d38cdce0d7114947235e27da441cd1808b9;hpb=dab441aea240f3b7c18a26d2ef51979ea36c301c;p=musl

diff --git a/src/env/__stack_chk_fail.c b/src/env/__stack_chk_fail.c
index 00634d38..e32596d1 100644
--- a/src/env/__stack_chk_fail.c
+++ b/src/env/__stack_chk_fail.c
@@ -1,27 +1,22 @@
 #include <string.h>
 #include <stdint.h>
 #include "pthread_impl.h"
-#include "atomic.h"
 
 uintptr_t __stack_chk_guard;
 
 void __init_ssp(void *entropy)
 {
-	/* Here the thread pointer is used without checking whether
-	 * it is available; this will crash if it's not. However,
-	 * this function is only meant to be called if the program
-	 * being run uses stack protector, and in that case, it would
-	 * crash without a thread pointer anyway, so it's better to
-	 * crash early before there is state to be lost on crash. */
-	pthread_t self = __pthread_self();
-	uintptr_t canary;
-	if (entropy) memcpy(&canary, entropy, 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);