#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;
- __stack_chk_guard = self->canary = canary;
+ 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)