overhaul SSP support to use a real canary

[musl] / src / thread / pthread_create.c

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index d84e50a..c3b65ae 100644 (file)
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -46,8 +46,6 @@ void pthread_exit(void *result)
 void __do_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
 {
        struct pthread *self = pthread_self();
-       cb->__f = f;
-       cb->__x = x;
        cb->__next = self->cancelbuf;
        self->cancelbuf = cb;
 }
@@ -122,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();