summaryrefslogtreecommitdiff
path: root/src/thread
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-05-03 20:42:45 -0400
committerRich Felker <dalias@aerifal.cx>2012-05-03 20:42:45 -0400
commit58aa5f45ed3282751ae118c107ff008d4df765dc (patch)
tree94859368fee26181f59f2b98911f1c46d146d25b /src/thread
parente765239f334d670e1b68289a2fcaa6b82a3b9666 (diff)
downloadmusl-58aa5f45ed3282751ae118c107ff008d4df765dc.tar.gz
overhaul SSP support to use a real canary
pthread structure has been adjusted to match the glibc/GCC abi for where the canary is stored on i386 and x86_64. it will need variants for other archs to provide the added security of the canary's entropy, but even without that it still works as well as the old "minimal" ssp support. eventually such changes will be made anyway, since they are also needed for GCC/C11 thread-local storage support (not yet implemented). care is taken not to attempt initializing the thread pointer unless the program actually uses SSP (by reference to __stack_chk_fail).
Diffstat (limited to 'src/thread')
-rw-r--r--src/thread/pthread_create.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index 0e1dbb2d..c3b65ae9 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -120,6 +120,7 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
new->tsd = (void *)tsd;
if (attr) new->detached = attr->_a_detach;
new->unblock_cancel = self->cancel;
+ new->canary = self->canary ^ (uintptr_t)&new;
stack = (void *)new;
__synccall_lock();