Page MenuHomeFreeBSD
Files F152438608

D17117.id49767.diff
No OneTemporary
Actions

D17117.id49767.diff
View Options

Index: head/libexec/rtld-elf/map_object.c
===================================================================
--- head/libexec/rtld-elf/map_object.c
+++ head/libexec/rtld-elf/map_object.c
@@ -93,6 +93,7 @@
Elf_Addr note_end;
char *note_map;
size_t note_map_len;
+ Elf_Addr text_end;
hdr = get_elf_header(fd, path, sb);
if (hdr == NULL)
@@ -116,6 +117,7 @@
note_map = NULL;
segs = alloca(sizeof(segs[0]) * hdr->e_phnum);
stack_flags = RTLD_DEFAULT_STACK_PF_EXEC | PF_R | PF_W;
+ text_end = 0;
while (phdr < phlimit) {
switch (phdr->p_type) {
@@ -130,6 +132,10 @@
path, nsegs);
goto error;
}
+ if ((segs[nsegs]->p_flags & PF_X) == PF_X) {
+ text_end = MAX(text_end,
+ round_page(segs[nsegs]->p_vaddr + segs[nsegs]->p_memsz));
+ }
break;
case PT_PHDR:
@@ -280,8 +286,7 @@
}
obj->mapbase = mapbase;
obj->mapsize = mapsize;
- obj->textsize = round_page(segs[0]->p_vaddr + segs[0]->p_memsz) -
- base_vaddr;
+ obj->textsize = text_end - base_vaddr;
obj->vaddrbase = base_vaddr;
obj->relocbase = mapbase - base_vaddr;
obj->dynamic = (const Elf_Dyn *) (obj->relocbase + phdyn->p_vaddr);
Index: head/libexec/rtld-elf/rtld.c
===================================================================
--- head/libexec/rtld-elf/rtld.c
+++ head/libexec/rtld-elf/rtld.c
@@ -1390,13 +1390,15 @@
if (nsegs == 0) { /* First load segment */
obj->vaddrbase = trunc_page(ph->p_vaddr);
obj->mapbase = obj->vaddrbase + obj->relocbase;
- obj->textsize = round_page(ph->p_vaddr + ph->p_memsz) -
- obj->vaddrbase;
} else { /* Last load segment */
obj->mapsize = round_page(ph->p_vaddr + ph->p_memsz) -
obj->vaddrbase;
}
nsegs++;
+ if ((ph->p_flags & PF_X) == PF_X) {
+ obj->textsize = MAX(obj->textsize,
+ round_page(ph->p_vaddr + ph->p_memsz) - obj->vaddrbase);
+ }
break;
case PT_DYNAMIC:

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 15, 11:34 PM (1 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31561626
Default Alt Text
D17117.id49767.diff (1 KB)

Event Timeline