RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make dynamic linker tell the debugger its own pathname 

use the main program's PT_INTERP header if possible, since this is
sure to be a correct (and hopefully absolute) pathname.
This commit is contained in:
Rich Felker 2012-07-13 01:31:02 -04:00
parent 48d20136b0
commit 649cec5f98
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ldso/dynlink.c
View File

@ -577,12 +577,16 @@ void *__dynlink(int argc, char **argv)
decode_dyn(lib); decode_dyn(lib);
if (aux[AT_PHDR]) { if (aux[AT_PHDR]) {
size_t interp_off = 0;
/* Find load address of the main program, via AT_PHDR vs PT_PHDR. */ /* Find load address of the main program, via AT_PHDR vs PT_PHDR. */
phdr = (void *)aux[AT_PHDR]; phdr = (void *)aux[AT_PHDR];
for (i=aux[AT_PHNUM]; i; i--, phdr=(void *)((char *)phdr + aux[AT_PHENT])) { for (i=aux[AT_PHNUM]; i; i--, phdr=(void *)((char *)phdr + aux[AT_PHENT])) {
if (phdr->p_type == PT_PHDR) if (phdr->p_type == PT_PHDR)
app->base = (void *)(aux[AT_PHDR] - phdr->p_vaddr); app->base = (void *)(aux[AT_PHDR] - phdr->p_vaddr);
else if (phdr->p_type == PT_INTERP)
interp_off = (size_t)phdr->p_vaddr;
} }
if (interp_off) lib->name = (char *)app->base + interp_off;
app->name = argv[0]; app->name = argv[0];
app->dynv = (void *)(app->base + find_dyn( app->dynv = (void *)(app->base + find_dyn(
(void *)aux[AT_PHDR], aux[AT_PHNUM], aux[AT_PHENT])); (void *)aux[AT_PHDR], aux[AT_PHNUM], aux[AT_PHENT]));
@ -612,6 +616,7 @@ void *__dynlink(int argc, char **argv)
} }
runtime = 0; runtime = 0;
close(fd); close(fd);
lib->name = ldname;
app->name = argv[0]; app->name = argv[0];
app->dynv = (void *)(app->base + dyno); app->dynv = (void *)(app->base + dyno);
aux[AT_ENTRY] = ehdr->e_entry; aux[AT_ENTRY] = ehdr->e_entry;