From: Rich Felker <dalias@libc.org>
To: musl@lists.openwall.com
Subject: Re: [PATCH] track pthread stack guard sizes
Date: Tue, 9 Jan 2018 12:22:04 -0500 [thread overview]
Message-ID: <20180109172204.GY1627@brightrain.aerifal.cx> (raw)
In-Reply-To: <20180106044443.14260-1-nenolod@dereferenced.org>
On Sat, Jan 06, 2018 at 04:44:43AM +0000, William Pitcock wrote:
> some applications (rustc) are dependent on pthread_getattr_np() providing the guard size.
> ---
> src/internal/pthread_impl.h | 1 +
> src/thread/pthread_create.c | 1 +
> src/thread/pthread_getattr_np.c | 1 +
> 3 files changed, 3 insertions(+)
>
> diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
> index 56e19348..c2cafeaa 100644
> --- a/src/internal/pthread_impl.h
> +++ b/src/internal/pthread_impl.h
> @@ -48,6 +48,7 @@ struct pthread {
> void *stdio_locks;
> uintptr_t canary_at_end;
> void **dtv_copy;
> + size_t guard_size;
> };
>
> struct __timer {
> diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
> index 6cbf85b3..0faad765 100644
> --- a/src/thread/pthread_create.c
> +++ b/src/thread/pthread_create.c
> @@ -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;
> --
> 2.15.0
I'm pretty sure there's another bug in this patch: the local variable
guard is uninitialized where you use it if the application provided a
stack and TLS was able to be allocated in the app-provided stack.
The line guard = 0; above should probably just be moved down one line
(and unindented one level).
Does this sound right?
Rich
next prev parent reply other threads:[~2018-01-09 17:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-06 4:44 William Pitcock
2018-01-09 17:22 ` Rich Felker [this message]
2018-01-09 22:24 ` William Pitcock
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180109172204.GY1627@brightrain.aerifal.cx \
--to=dalias@libc.org \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).