remove lazy ssp initialization

now that thread pointer is initialized always, ssp canary
initialization can be done unconditionally. this simplifies
the ldso as it does not try to detect ssp usage, and the
init function itself as it is always called exactly once.
this also merges ssp init path for shared and static linking.

1 files changed, 5 insertions, 13 deletions

diff --git a/src/env/__stack_chk_fail.c b/src/env/__stack_chk_fail.c
index 00634d38..87ac473d 100644
--- a/src/env/__stack_chk_fail.c
+++ b/src/env/__stack_chk_fail.c
@@ -1,24 +1,16 @@
 #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;
+
+	if (libc.has_thread_pointer)
+		__pthread_self()->canary = __stack_chk_guard;
 }
 
 void __stack_chk_fail(void)