diff options
Diffstat (limited to 'elf/dl-reloc.c')
-rw-r--r-- | elf/dl-reloc.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 053916eeae..164f4efa10 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -200,17 +200,6 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[], newp->start = PTR_ALIGN_DOWN (ph->p_vaddr, GLRO(dl_pagesize)) + (caddr_t) l->l_addr; - if (__mprotect (newp->start, newp->len, PROT_READ|PROT_WRITE) < 0) - { - errstring = N_("cannot make segment writable for relocation"); - call_error: - _dl_signal_error (errno, l->l_name, NULL, errstring); - } - -#if (PF_R | PF_W | PF_X) == 7 && (PROT_READ | PROT_WRITE | PROT_EXEC) == 7 - newp->prot = (PF_TO_PROT - >> ((ph->p_flags & (PF_R | PF_W | PF_X)) * 4)) & 0xf; -#else newp->prot = 0; if (ph->p_flags & PF_R) newp->prot |= PROT_READ; @@ -218,7 +207,14 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[], newp->prot |= PROT_WRITE; if (ph->p_flags & PF_X) newp->prot |= PROT_EXEC; -#endif + + if (__mprotect (newp->start, newp->len, newp->prot|PROT_WRITE) < 0) + { + errstring = N_("cannot make segment writable for relocation"); + call_error: + _dl_signal_error (errno, l->l_name, NULL, errstring); + } + newp->next = textrels; textrels = newp; } |