Page MenuHomeFreeBSD
Files F159574836

D54710.diff
No OneTemporary
Actions

D54710.diff
View Options

diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c
--- a/libexec/rtld-elf/map_object.c
+++ b/libexec/rtld-elf/map_object.c
@@ -318,7 +318,7 @@
phsize);
obj->phdr_alloc = true;
}
- obj->phsize = phsize;
+ obj->phnum = phsize / sizeof(*phdr);
if (phinterp != NULL)
obj->interp = (const char *)(obj->relocbase +
phinterp->p_vaddr);
diff --git a/libexec/rtld-elf/powerpc/reloc.c b/libexec/rtld-elf/powerpc/reloc.c
--- a/libexec/rtld-elf/powerpc/reloc.c
+++ b/libexec/rtld-elf/powerpc/reloc.c
@@ -366,9 +366,7 @@
* Synchronize icache for executable segments in case we made
* any changes.
*/
- for (phdr = obj->phdr;
- (const char *)phdr < (const char *)obj->phdr + obj->phsize;
- phdr++) {
+ for (phdr = obj->phdr; phdr < obj->phdr + obj->phnum; phdr++) {
if (phdr->p_type == PT_LOAD && (phdr->p_flags & PF_X) != 0) {
__syncicache(obj->relocbase + phdr->p_vaddr,
phdr->p_memsz);
diff --git a/libexec/rtld-elf/powerpc64/reloc.c b/libexec/rtld-elf/powerpc64/reloc.c
--- a/libexec/rtld-elf/powerpc64/reloc.c
+++ b/libexec/rtld-elf/powerpc64/reloc.c
@@ -364,9 +364,7 @@
* Synchronize icache for executable segments in case we made
* any changes.
*/
- for (phdr = obj->phdr;
- (const char *)phdr < (const char *)obj->phdr + obj->phsize;
- phdr++) {
+ for (phdr = obj->phdr; phdr < obj->phdr + obj->phnum; phdr++) {
if (phdr->p_type == PT_LOAD && (phdr->p_flags & PF_X) != 0) {
__syncicache(obj->relocbase + phdr->p_vaddr,
phdr->p_memsz);
diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h
--- a/libexec/rtld-elf/rtld.h
+++ b/libexec/rtld-elf/rtld.h
@@ -152,7 +152,7 @@
const Elf_Dyn *dynamic; /* Dynamic section */
caddr_t entry; /* Entry point */
const Elf_Phdr *phdr; /* Program header if it is mapped, else NULL */
- size_t phsize; /* Size of program header in bytes */
+ size_t phnum; /* Number of program headers */
const char *interp; /* Pathname of the interpreter, if any */
Elf_Word stack_flags;
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -1684,7 +1684,7 @@
continue;
obj->phdr = phdr;
- obj->phsize = ph->p_memsz;
+ obj->phnum = ph->p_memsz / sizeof(*ph);
obj->relocbase = __DECONST(char *, phdr) - ph->p_vaddr;
break;
}
@@ -2423,8 +2423,7 @@
first_seg = true;
obj->stack_flags = PF_X | PF_R | PF_W;
- for (ph = obj->phdr;
- (const char *)ph < (const char *)obj->phdr + obj->phsize; ph++) {
+ for (ph = obj->phdr; ph < obj->phdr + obj->phnum; ph++) {
switch (ph->p_type) {
case PT_LOAD:
if (first_seg) {
@@ -2486,7 +2485,7 @@
ehdr = (Elf_Ehdr *)mapbase;
objtmp.phdr = (Elf_Phdr *)((char *)mapbase + ehdr->e_phoff);
- objtmp.phsize = ehdr->e_phnum * sizeof(objtmp.phdr[0]);
+ objtmp.phnum = ehdr->e_phnum;
/* Initialize the object list. */
TAILQ_INIT(&obj_list);
@@ -2998,7 +2997,7 @@
obj = obj_new();
phdr = (const Elf_Phdr *)((const char *)addr + ehdr->e_phoff);
obj->phdr = phdr;
- obj->phsize = ehdr->e_phnum * sizeof(*phdr);
+ obj->phnum = ehdr->e_phnum;
phlimit = phdr + ehdr->e_phnum;
seg0 = segn = NULL;
@@ -3380,10 +3379,10 @@
{
const Elf_Phdr *ph;
void *base;
- size_t l, sz;
+ size_t sz;
int prot;
- for (l = obj->phsize / sizeof(*ph), ph = obj->phdr; l > 0; l--, ph++) {
+ for (ph = obj->phdr; ph < obj->phdr + obj->phnum; ph++) {
if (ph->p_type != PT_LOAD || (ph->p_flags & PF_W) != 0)
continue;
base = obj->relocbase + rtld_trunc_page(ph->p_vaddr);
@@ -4331,7 +4330,7 @@
phdr_info->dlpi_addr = (Elf_Addr)obj->relocbase;
phdr_info->dlpi_name = obj->path;
phdr_info->dlpi_phdr = obj->phdr;
- phdr_info->dlpi_phnum = obj->phsize / sizeof(obj->phdr[0]);
+ phdr_info->dlpi_phnum = obj->phnum;
phdr_info->dlpi_tls_modid = obj->tlsindex;
phdr_info->dlpi_tls_data = (char *)tls_get_addr_slow(_tcb_get(),
obj->tlsindex, 0, true);
@@ -6149,8 +6148,7 @@
caddr_t relro_page;
size_t relro_size;
- for (ph = obj->phdr; (const char *)ph < (const char *)obj->phdr +
- obj->phsize; ph++) {
+ for (ph = obj->phdr; ph < obj->phdr + obj->phnum; ph++) {
if (ph->p_type != PT_GNU_RELRO)
continue;
relro_page = obj->relocbase + rtld_trunc_page(ph->p_vaddr);

File Metadata

Mime Type
text/plain
Expires
Tue, Jun 16, 8:08 PM (4 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34002264
Default Alt Text
D54710.diff (4 KB)

Event Timeline