diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2018-02-02 20:08:55 +0000 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2018-02-03 10:04:24 -0500 |
| commit | 7c709f2d4f9872d1b445f760b0e68da89e256b9e (patch) | |
| tree | 6676308cc593374bc1ee601456665848ddde74eb | |
| parent | b3ae7beabb9f0c219bb8a8b63567a01c6530c1ac (diff) | |
| download | musl-7c709f2d4f9872d1b445f760b0e68da89e256b9e.tar.gz | |
store pthread stack guard sizes for pthread_getattr_np
| -rw-r--r-- | src/internal/pthread_impl.h | 1 | ||||
| -rw-r--r-- | src/thread/pthread_create.c | 3 | ||||
| -rw-r--r-- | src/thread/pthread_getattr_np.c | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h index f0b2c20c..4a0db987 100644 --- a/src/internal/pthread_impl.h +++ b/src/internal/pthread_impl.h @@ -46,6 +46,7 @@ struct pthread { char *dlerror_buf; int dlerror_flag; void *stdio_locks; + size_t guard_size; uintptr_t canary_at_end; void **dtv_copy; }; diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c index 34cd9936..439ee363 100644 --- a/src/thread/pthread_create.c +++ b/src/thread/pthread_create.c @@ -232,8 +232,8 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att memset(stack, 0, need); } else { size = ROUND(need); - guard = 0; } + guard = 0; } else { guard = ROUND(attr._a_guardsize); size = guard + ROUND(attr._a_stacksize @@ -265,6 +265,7 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att new->map_size = size; new->stack = stack; new->stack_size = stack - stack_limit; + new->guard_size = guard; new->start = entry; new->start_arg = arg; new->self = new; diff --git a/src/thread/pthread_getattr_np.c b/src/thread/pthread_getattr_np.c index ae26a5ab..29a209bd 100644 --- a/src/thread/pthread_getattr_np.c +++ b/src/thread/pthread_getattr_np.c @@ -7,6 +7,7 @@ int pthread_getattr_np(pthread_t t, pthread_attr_t *a) { *a = (pthread_attr_t){0}; a->_a_detach = !!t->detached; + a->_a_guardsize = t->guard_size; if (t->stack) { a->_a_stackaddr = (uintptr_t)t->stack; a->_a_stacksize = t->stack_size; |