diff options
| author | kib <kib@FreeBSD.org> | 2016-08-19 08:07:04 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-08-19 08:07:04 +0000 |
| commit | c0bb62a13cd872e9a1d0ed79978de95affe79511 (patch) | |
| tree | 5521a91a2551ca36a2b5769c28a22474e592b681 | |
| parent | 09dd4f1c67d46796077bed5d83d877ff65afd235 (diff) | |
| download | FreeBSD-src-c0bb62a13cd872e9a1d0ed79978de95affe79511.zip FreeBSD-src-c0bb62a13cd872e9a1d0ed79978de95affe79511.tar.gz | |
MFC r304012:
Fill phdr and phsize for rtld object.
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index c0d82a2..0b72f85 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1872,6 +1872,7 @@ static void init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info) { Obj_Entry objtmp; /* Temporary rtld object */ + const Elf_Ehdr *ehdr; const Elf_Dyn *dyn_rpath; const Elf_Dyn *dyn_soname; const Elf_Dyn *dyn_runpath; @@ -1910,6 +1911,9 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info) relocate_objects(&objtmp, true, &objtmp, 0, NULL); } + ehdr = (Elf_Ehdr *)mapbase; + objtmp.phdr = (Elf_Phdr *)((char *)mapbase + ehdr->e_phoff); + objtmp.phsize = ehdr->e_phnum * sizeof(objtmp.phdr[0]); /* Initialize the object list. */ TAILQ_INIT(&obj_list); |
