projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
release notes for 0.9.11
[musl]
/
src
/
env
/
__stack_chk_fail.c
diff --git
a/src/env/__stack_chk_fail.c
b/src/env/__stack_chk_fail.c
index
c6d0feb
..
031a1ed
100644
(file)
--- a/
src/env/__stack_chk_fail.c
+++ b/
src/env/__stack_chk_fail.c
@@
-6,15
+6,14
@@
uintptr_t __stack_chk_guard;
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;
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;
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)
}
void __stack_chk_fail(void)