D17117.id47910.diff
No OneTemporary
Actions

Size

840 B

Referenced Files

None

Subscribers

None

D17117.id47910.diff
View Options

	Index: libexec/rtld-elf/rtld.c
	===================================================================
	--- libexec/rtld-elf/rtld.c
	+++ libexec/rtld-elf/rtld.c
	@@ -1477,13 +1477,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);
	+ }
	if (!(ph->p_flags & PF_W)) {
	Elf_Addr start_addr = ph->p_vaddr;
	obj->text_rodata_start = MIN(start_addr, obj->text_rodata_start);