diff options
author | Timo Teräs <timo.teras@iki.fi> | 2014-03-25 21:50:15 +0200 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2014-03-25 19:12:45 -0400 |
commit | 2b74315d8a31ad8fbcd369116c82e055e0ec3fb7 (patch) | |
tree | 38c6947cf66ea892c50129dc5f5090ccd4ac22cb /src/env/__init_security.c | |
parent | 436d3723afcb1ee40eb849d56fd0472d83dd598c (diff) | |
download | musl-2b74315d8a31ad8fbcd369116c82e055e0ec3fb7.tar.gz musl-2b74315d8a31ad8fbcd369116c82e055e0ec3fb7.tar.bz2 musl-2b74315d8a31ad8fbcd369116c82e055e0ec3fb7.tar.xz musl-2b74315d8a31ad8fbcd369116c82e055e0ec3fb7.zip |
remove lazy ssp initialization
now that thread pointer is initialized always, ssp canary
initialization can be done unconditionally. this simplifies
the ldso as it does not try to detect ssp usage, and the
init function itself as it is always called exactly once.
this also merges ssp init path for shared and static linking.
Diffstat (limited to 'src/env/__init_security.c')
-rw-r--r-- | src/env/__init_security.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/env/__init_security.c b/src/env/__init_security.c index 6204c5e1..da5ae948 100644 --- a/src/env/__init_security.c +++ b/src/env/__init_security.c @@ -15,9 +15,7 @@ void __init_security(size_t *aux) struct pollfd pfd[3] = { {.fd=0}, {.fd=1}, {.fd=2} }; int i; -#ifndef SHARED __init_ssp((void *)aux[AT_RANDOM]); -#endif if (aux[AT_UID]==aux[AT_EUID] && aux[AT_GID]==aux[AT_EGID] && !aux[AT_SECURE]) return; |