mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

(_dl_relocate_object): Move PT_GNU_RELRO protection into... (_dl_protect_relro): New routine.

Browse Source
This commit is contained in:
Ulrich Drepper 2004-01-24 08:33:05 +00:00
parent e151ce7ad3
commit 75631a5763
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
elf/dl-reloc.c
View File

@ -311,23 +311,25 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
/* In case we can protect the data now that the relocations are
done, do it. */
if (l->l_relro_size != 0)
{
ElfW(Addr) start = ((l->l_addr + l->l_relro_addr)
& ~(GL(dl_pagesize) - 1));
ElfW(Addr) end = ((l->l_addr + l->l_relro_addr + l->l_relro_size)
& ~(GL(dl_pagesize) - 1));
if (start != end
&& __mprotect ((void *) start, end - start, PROT_READ) < 0)
{
errstring = N_("\
cannot apply additional memory protection after relocation");
goto call_error;
}
}
_dl_protect_relro (l);
}
INTDEF (_dl_relocate_object)
void internal_function
_dl_protect_relro (struct link_map *l)
{
ElfW(Addr) start = ((l->l_addr + l->l_relro_addr) & ~(GL(dl_pagesize) - 1));
ElfW(Addr) end = ((l->l_addr + l->l_relro_addr + l->l_relro_size)
& ~(GL(dl_pagesize) - 1));
if (start != end
&& __mprotect ((void *) start, end - start, PROT_READ) < 0)
{
const char *errstring = N_("\
cannot apply additional memory protection after relocation");
INTUSE(_dl_signal_error) (errno, l->l_name, NULL, errstring);
}
}
void
internal_function __attribute_noinline__