D25319.id73220.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D25319.id73220.diff
View Options

	Index: libexec/rtld-elf/rtld.c
	===================================================================
	--- libexec/rtld-elf/rtld.c
	+++ libexec/rtld-elf/rtld.c
	@@ -2182,6 +2182,34 @@
	}
	}
	}
	+
	+static void
	+parse_rtld_phdr(Obj_Entry *obj)
	+{
	+ const Elf_Phdr *ph;
	+ Elf_Addr note_start, note_end;
	+
	+ obj->stack_flags = PF_X \| PF_R \| PF_W;
	+ for (ph = obj->phdr; (const char )ph < (const char )obj->phdr +
	+ obj->phsize; ph++) {
	+ switch (ph->p_type) {
	+ case PT_GNU_STACK:
	+ obj->stack_flags = ph->p_flags;
	+ break;
	+ case PT_GNU_RELRO:
	+ obj->relro_page = obj->relocbase +
	+ trunc_page(ph->p_vaddr);
	+ obj->relro_size = round_page(ph->p_memsz);
	+ break;
	+ case PT_NOTE:
	+ note_start = (Elf_Addr)obj->relocbase + ph->p_vaddr;
	+ note_end = note_start + ph->p_filesz;
	+ digest_notes(obj, note_start, note_end);
	+ break;
	+ }
	+ }
	+}
	+
	/*
	* Initialize the dynamic linker. The argument is the address at which
	* the dynamic linker has been mapped into memory. The primary task of
	@@ -2251,6 +2279,9 @@
	/* Replace the path with a dynamically allocated copy. */
	obj_rtld.path = xstrdup(ld_path_rtld);

	+ parse_rtld_phdr(&obj_rtld);
	+ obj_enforce_relro(&obj_rtld);
	+
	r_debug.r_brk = r_debug_state;
	r_debug.r_state = RT_CONSISTENT;
	}