size_t this_min, this_max;
off_t off_start;
Ehdr *eh;
- Phdr *ph;
+ Phdr *ph, *ph0;
unsigned prot;
unsigned char *map, *base;
size_t dyn;
if (eh->e_phoff + phsize > l) {
l = pread(fd, buf+1, phsize, eh->e_phoff);
if (l != phsize) return 0;
- eh->e_phoff = sizeof *eh;
+ ph = ph0 = (void *)(buf + 1);
+ } else {
+ ph = ph0 = (void *)((char *)buf + eh->e_phoff);
}
- ph = (void *)((char *)buf + eh->e_phoff);
- dso->phdr = ph;
- dso->phnum = eh->e_phnum;
for (i=eh->e_phnum; i; i--, ph=(void *)((char *)ph+eh->e_phentsize)) {
if (ph->p_type == PT_DYNAMIC)
dyn = ph->p_vaddr;
map = mmap((void *)addr_min, map_len, prot, MAP_PRIVATE, fd, off_start);
if (map==MAP_FAILED) return 0;
base = map - addr_min;
- ph = (void *)((char *)buf + eh->e_phoff);
- for (i=eh->e_phnum; i; i--, ph=(void *)((char *)ph+eh->e_phentsize)) {
+ dso->phdr = 0;
+ dso->phnum = 0;
+ for (ph=ph0, i=eh->e_phnum; i; i--, ph=(void *)((char *)ph+eh->e_phentsize)) {
if (ph->p_type != PT_LOAD) continue;
+ /* Check if the programs headers are in this load segment, and
+ * if so, record the address for use by dl_iterate_phdr. */
+ if (!dso->phdr && eh->e_phoff >= ph->p_offset
+ && eh->e_phoff+phsize <= ph->p_offset+ph->p_filesz) {
+ dso->phdr = (void *)(base + ph->p_vaddr
+ + (eh->e_phoff-ph->p_offset));
+ dso->phnum = eh->e_phnum;
+ }
/* Reuse the existing mapping for the lowest-address LOAD */
if ((ph->p_vaddr & -PAGE_SIZE) == addr_min) continue;
this_min = ph->p_vaddr & -PAGE_SIZE;
goto error;
break;
}
- if (!runtime) reclaim_gaps(base, (void *)((char *)buf + eh->e_phoff),
- eh->e_phentsize, eh->e_phnum);
+ if (!runtime) reclaim_gaps(base, ph0, eh->e_phentsize, eh->e_phnum);
dso->map = map;
dso->map_len = map_len;
dso->base = base;
if (!sys_path) {
FILE *f = fopen(ETC_LDSO_PATH, "rbe");
if (f) {
- if (getline(&sys_path, (size_t[1]){0}, f) > 0) {
- size_t l = strlen(sys_path);
- if (l && sys_path[l-1]=='\n')
- sys_path[l-1] = 0;
+ if (getdelim(&sys_path, (size_t[1]){0}, 0, f) <= 0) {
+ free(sys_path);
+ sys_path = "";
}
fclose(f);
}
}
if (dyn[0] & (1<<DT_INIT))
((void (*)(void))(p->base + dyn[DT_INIT]))();
+ if (!need_locking && libc.threads_minus_1) {
+ need_locking = 1;
+ pthread_mutex_lock(&init_fini_lock);
+ }
}
if (need_locking) pthread_mutex_unlock(&init_fini_lock);
}
void *__tls_get_addr(size_t *v)
{
pthread_t self = __pthread_self();
- if (self->dtv && v[0]<=(size_t)self->dtv[0] && self->dtv[v[0]])
+ if (v[0]<=(size_t)self->dtv[0] && self->dtv[v[0]])
return (char *)self->dtv[v[0]]+v[1];
/* Block signals to make accessing new TLS async-signal-safe */
sigset_t set;
pthread_sigmask(SIG_BLOCK, SIGALL_SET, &set);
- if (self->dtv && v[0]<=(size_t)self->dtv[0] && self->dtv[v[0]]) {
+ if (v[0]<=(size_t)self->dtv[0] && self->dtv[v[0]]) {
pthread_sigmask(SIG_SETMASK, &set, 0);
return (char *)self->dtv[v[0]]+v[1];
}
for (p=head; p->tls_id != v[0]; p=p->next);
/* Get new DTV space from new DSO if needed */
- if (!self->dtv || v[0] > (size_t)self->dtv[0]) {
+ if (v[0] > (size_t)self->dtv[0]) {
void **newdtv = p->new_dtv +
(v[0]+1)*sizeof(void *)*a_fetch_add(&p->new_dtv_idx,1);
- if (self->dtv) memcpy(newdtv, self->dtv,
+ memcpy(newdtv, self->dtv,
((size_t)self->dtv[0]+1) * sizeof(void *));
newdtv[0] = (void *)v[0];
self->dtv = newdtv;
}
#endif
+int __dlinfo(void *dso, int req, void *res)
+{
+ if (invalid_dso_handle(dso)) return -1;
+ if (req != RTLD_DI_LINKMAP) {
+ snprintf(errbuf, sizeof errbuf, "Unsupported request %d", req);
+ errflag = 1;
+ return -1;
+ }
+ *(struct link_map **)res = dso;
+ return 0;
+}
+
char *dlerror()
{
if (!errflag) return 0;