static jmp_buf rtld_fail;
static pthread_rwlock_t lock;
-#define AUX_CNT 15
+#define AUX_CNT 24
#define DYN_CNT 34
static void decode_vec(size_t *v, size_t *a, size_t cnt)
decode_vec(auxv, aux, AUX_CNT);
+ /* Only trust user/env if kernel says we're not suid/sgid */
+ if ((aux[0]&0x7800)!=0x7800 || aux[AT_UID]!=aux[AT_EUID]
+ || aux[AT_GID]!=aux[AT_EGID] || aux[AT_SECURE]) {
+ env_path = 0;
+ env_preload = 0;
+ }
+
for (i=0; auxv[i]; i+=2) {
if (auxv[i]==AT_SYSINFO_EHDR) {
vdso_base = auxv[i+1];
}
}
- /* Only trust user/env if kernel says we're not suid/sgid */
- if ((aux[0]&0x7800)!=0x7800 || aux[AT_UID]!=aux[AT_EUID]
- || aux[AT_GID]!=aux[AT_EGID]) {
- env_path = 0;
- env_preload = 0;
- }
-
/* Relocate ldso's DYNAMIC pointer and load vector */
decode_vec((void *)(got[0] += aux[AT_BASE]), lib_dyn, DYN_CNT);