Make getauxval work with static linking

While for dynamic linking the _dl_auxvt array is provided in
dl-startup.c as part of the ldso, is was undefined for statically
linked binaries. This resulted in a corresponding linker error if
a statically linked program used getauxval.

To provide _dl_auxvt also for statically linked binaries, a definition
of _dl_auxvt is added to dl-support.c and initialized by _dl_aux_init().

Signed-off-by: Marcus Haehnel <marcus.haehnel@kernkonzept.com>

1 files changed, 6 insertions, 16 deletions

diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index 64a9c8214..a84492248 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -43,7 +43,7 @@
 /* Are we in a secure process environment or are we dealing
  * with setuid stuff?  If we are dynamically linked, then we
  * already have _dl_secure, otherwise we need to re-examine
- * auxvt[] below.
+ * _dl_auxvt[] below.
  */
 int _pe_secure = 0;
 libc_hidden_data_def(_pe_secure)
@@ -373,7 +373,6 @@ void __uClibc_main(int (*main)(int, char **, char **), int argc,
 {
 #ifndef SHARED
     unsigned long *aux_dat;
-    ElfW(auxv_t) auxvt[AT_EGID + 1];
 #endif
 
 #ifdef __UCLIBC_HAS_THREADS_NATIVE__
@@ -399,23 +398,14 @@ void __uClibc_main(int (*main)(int, char **, char **), int argc,
 
 #ifndef SHARED
     /* Pull stuff from the ELF header when possible */
-    memset(auxvt, 0x00, sizeof(auxvt));
     aux_dat = (unsigned long*)__environ;
     while (*aux_dat) {
 	aux_dat++;
     }
     aux_dat++;
-    while (*aux_dat) {
-	ElfW(auxv_t) *auxv_entry = (ElfW(auxv_t) *) aux_dat;
-	if (auxv_entry->a_type <= AT_EGID) {
-	    memcpy(&(auxvt[auxv_entry->a_type]), auxv_entry, sizeof(ElfW(auxv_t)));
-	}
-	aux_dat += 2;
-    }
     /* Get the program headers (_dl_phdr) from the aux vector
        It will be used into __libc_setup_tls. */
-
-    _dl_aux_init (auxvt);
+    _dl_aux_init ((ElfW(auxv_t) *)aux_dat);
 #endif
 
     /* We need to initialize uClibc.  If we are dynamically linked this
@@ -431,10 +421,10 @@ void __uClibc_main(int (*main)(int, char **, char **), int argc,
 #ifndef SHARED
     /* Prevent starting SUID binaries where the stdin. stdout, and
      * stderr file descriptors are not already opened. */
-    if ((auxvt[AT_UID].a_un.a_val == (size_t)-1 && __check_suid()) ||
-	    (auxvt[AT_UID].a_un.a_val != (size_t)-1 &&
-	    (auxvt[AT_UID].a_un.a_val != auxvt[AT_EUID].a_un.a_val ||
-	     auxvt[AT_GID].a_un.a_val != auxvt[AT_EGID].a_un.a_val)))
+    if ((_dl_auxvt[AT_UID].a_un.a_val == (size_t)-1 && __check_suid()) ||
+	    (_dl_auxvt[AT_UID].a_un.a_val != (size_t)-1 &&
+	    (_dl_auxvt[AT_UID].a_un.a_val != _dl_auxvt[AT_EUID].a_un.a_val ||
+	     _dl_auxvt[AT_GID].a_un.a_val != _dl_auxvt[AT_EGID].a_un.a_val)))
 #else
     if (_dl_secure)
 #endif