X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fenv%2F__stack_chk_fail.c;h=031a1ed7058e4aefd498cc4a379858eacc2ac9c2;hb=f4ded939bf90cd6baed6b4e723e54a62c9bdb6b9;hp=c6d0feb999cd8447d2c19af23091964c69f37cf1;hpb=58aa5f45ed3282751ae118c107ff008d4df765dc;p=musl

diff --git a/src/env/__stack_chk_fail.c b/src/env/__stack_chk_fail.c
index c6d0feb9..031a1ed7 100644
--- a/src/env/__stack_chk_fail.c
+++ b/src/env/__stack_chk_fail.c
@@ -6,15 +6,14 @@
 
 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);
+	if (entropy) memcpy(&canary, entropy, sizeof canary);
 	else canary = (uintptr_t)&canary * 1103515245;
-	__stack_chk_guard = self->canary = canary;
+	a_cas_l(&__stack_chk_guard, 0, canary);
+	self->canary = __stack_chk_guard;
 }
 
 void __stack_chk_fail(void)