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
bbba351
..
031a1ed
100644
(file)
--- a/
src/env/__stack_chk_fail.c
+++ b/
src/env/__stack_chk_fail.c
@@
-1,11
+1,19
@@
+#include <string.h>
+#include <inttypes.h>
+#include <elf.h>
#include "pthread_impl.h"
#include "atomic.h"
#include "pthread_impl.h"
#include "atomic.h"
-void __init_ssp(void)
+uintptr_t __stack_chk_guard;
+
+void __init_ssp(void *entropy)
{
{
-#ifndef __PIC__
- __pthread_self_init();
-#endif
+ pthread_t self = __pthread_self_init();
+ 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;
}
void __stack_chk_fail(void)
}
void __stack_chk_fail(void)