path: root/src/env/__stack_chk_fail.c
diff options
authorRich Felker <>2012-10-07 21:43:46 -0400
committerRich Felker <>2012-10-07 21:43:46 -0400
commit0a96a37f06fda78ce3674b425888b1fc090578aa (patch)
tree562b45acc1191a74bca5db876b44fd652678c94f /src/env/__stack_chk_fail.c
parent017bf140ffb41e9a016df84dc4c1806e0686b28a (diff)
clean up and refactor program initialization
the code in __libc_start_main is now responsible for parsing auxv, rather than duplicating the parsing all over the place. this should shave off a few cycles and some code size. __init_libc is left as an external-linkage function despite the fact that it could be static, to prevent it from being inlined and permanently wasting stack space when main is called. a few other minor changes are included, like eliminating per-thread ssp canaries (they were likely broken when combined with certain dlopen usages, and completely unnecessary) and some other unnecessary checks. since this code gets linked into every program, it should be as small and simple as possible.
Diffstat (limited to 'src/env/__stack_chk_fail.c')
1 files changed, 2 insertions, 3 deletions
diff --git a/src/env/__stack_chk_fail.c b/src/env/__stack_chk_fail.c
index eac852b7..3e2e4b6d 100644
--- a/src/env/__stack_chk_fail.c
+++ b/src/env/__stack_chk_fail.c
@@ -6,13 +6,12 @@
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;
a_cas_l(&__stack_chk_guard, 0, canary);
self->canary = __stack_chk_guard;