aboutsummaryrefslogtreecommitdiffstats
path: root/libc/private/bionic_tls.h
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-01-16 13:13:22 -0800
committerNick Kralevich <nnk@google.com>2013-01-16 13:16:42 -0800
commit36bd371e26c716cbc18e11801b13eff0352d91b0 (patch)
treeb63e06f7a65f3ac2df09449bb65172644f230386 /libc/private/bionic_tls.h
parentba117e4172fe6f160bf5f4d58b37e12c08c34245 (diff)
downloadandroid_bionic-36bd371e26c716cbc18e11801b13eff0352d91b0.tar.gz
android_bionic-36bd371e26c716cbc18e11801b13eff0352d91b0.tar.bz2
android_bionic-36bd371e26c716cbc18e11801b13eff0352d91b0.zip
Revert "stack protector: use AT_RANDOM"
The AT_RANDOM changes broke setuid / setgid executables such as "ping". When the linker executes a setuid program, it cleans the environment, removing any invalid environment entries, and adding "NULL"s to the end of the environment array for each removed variable. Later on, we try to determine the location of the aux environment variable, and get tripped up by these extra NULLs. Reverting this patch will get setuid executables working again, but getauxval() is still broken for setuid programs because of this bug. This reverts commit e3a49a8661125f24aec8a1453e54b3b78005e21e. Change-Id: I05c58a896b1fe32cfb5d95d43b096045cda0aa4a
Diffstat (limited to 'libc/private/bionic_tls.h')
-rw-r--r--libc/private/bionic_tls.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/libc/private/bionic_tls.h b/libc/private/bionic_tls.h
index b33e53ec9..f661ccf24 100644
--- a/libc/private/bionic_tls.h
+++ b/libc/private/bionic_tls.h
@@ -29,7 +29,6 @@
#define _SYS_TLS_H
#include <sys/cdefs.h>
-#include <stdint.h>
__BEGIN_DECLS
@@ -135,7 +134,7 @@ extern void* __get_tls( void );
extern void* __get_stack_base(int *p_stack_size);
/* Initialize the TLS. */
-extern void __libc_init_tls(uintptr_t* elfdata);
+extern void __libc_init_tls(unsigned** elfdata);
__END_DECLS