diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-reloc.c | 8 | ||||
| -rw-r--r-- | elf/rtld.c | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index ebc31d07fa..a3590ff749 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -76,6 +76,14 @@ _dl_relocate_object (struct link_map *l, int lazy) else scope = _dl_loaded; + if (l->l_type == lt_interpreter) + /* We cannot be lazy when relocating the dynamic linker itself. It + was previously relocated eagerly (allowing us to be running now), + and needs always to be fully relocated so it can run without the + aid of run-time fixups (because it's the one to do them), so we + must always re-relocate its PLT eagerly. */ + lazy = 0; + ELF_DYNAMIC_RELOCATE (l, lazy, resolve); /* Restore list frobnication done above for DT_SYMBOLIC. */ diff --git a/elf/rtld.c b/elf/rtld.c index 409b9705d8..c36409a995 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -70,6 +70,13 @@ _dl_start (void *arg) /* Relocate ourselves so we can do normal function calls and data access using the global offset table. */ + /* We must initialize `l_type' to make sure it is not `lt_interpreter'. + That is the type to describe us, but not during bootstrapping--it + indicates to elf_machine_rel{,a} that we were already relocated during + bootstrapping, so it must anti-perform each bootstrapping relocation + before applying the final relocation when ld.so is linked in as + normal a shared library. */ + rtld_map.l_type = lt_library; ELF_DYNAMIC_RELOCATE (&rtld_map, 0, NULL); |