diff options
| author | Roland McGrath <roland@gnu.org> | 2004-10-22 23:34:50 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-10-22 23:34:50 +0000 |
| commit | 2d6d0bf87caef8027c6154a304390d0a4fe6cd49 (patch) | |
| tree | 13881f505d99268e23944d2e5bde857189d5a0f1 | |
| parent | b289066baa1d3900def7430fc0003687d05b11ed (diff) | |
2004-10-22 Roland McGrath <roland@frob.com>
* exec.c (check_elf_phdr): Return early on setting ENOEXEC.
Only touch E->info.elf.phdr_addr once, on the PT_LOAD segment that
actually contains the e_phoff location in the file.
(do_exec): If E.info.elf.phdr_addr is zero, don't set BOOT->phdr_size.
| -rw-r--r-- | exec/exec.c | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/exec/exec.c b/exec/exec.c index a4dcc375..e35aa7b2 100644 --- a/exec/exec.c +++ b/exec/exec.c @@ -39,6 +39,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <sys/stat.h> #include <sys/param.h> #include <unistd.h> +#include <stdbool.h> mach_port_t procserver; /* Our proc port. */ @@ -898,6 +899,7 @@ static void check_elf_phdr (struct execdata *e, const ElfW(Phdr) *mapped_phdr) { const ElfW(Phdr) *phdr; + bool seen_phdr = false; memcpy (e->info.elf.phdr, mapped_phdr, e->info.elf.phnum * sizeof (ElfW(Phdr))); @@ -917,17 +919,29 @@ check_elf_phdr (struct execdata *e, const ElfW(Phdr) *mapped_phdr) e->interp.phdr = phdr; break; case PT_LOAD: - /* Sanity check. */ - if ((phdr->p_offset & -phdr->p_align) == 0) - e->info.elf.phdr_addr += phdr->p_vaddr - phdr->p_offset; if (e->file_size <= (off_t) (phdr->p_offset + phdr->p_filesz)) - e->error = ENOEXEC; + { + e->error = ENOEXEC; + return; + } + /* Check if this is the segment that contains the phdr image. */ + if (!seen_phdr + && (phdr->p_offset & -phdr->p_align) == 0 /* Sanity check. */ + && phdr->p_offset <= e->info.elf.phdr_addr + && e->info.elf.phdr_addr - phdr->p_offset < phr->p_filesz) + { + e->info.elf.phdr_addr += phdr->p_vaddr - phdr->p_offset; + seen_phdr = true; + } break; case PT_GNU_STACK: e->info.elf.execstack = phdr->p_flags & PF_X; break; } + + if (!seen_phdr) + e->info.elf.phdr_addr = 0; } @@ -1807,12 +1821,15 @@ do_exec (file_t file, /* Now record some essential addresses from the image itself that the program's startup code will need to know. We do this after loading the image so that a load-anywhere image gets the adjusted addresses. */ + if (e.info.elf.phdr_addr != 0) + { #ifdef BFD - if (!e.bfd) + if (!e.bfd) #endif - e.info.elf.phdr_addr += e.info.elf.loadbase; - boot->phdr_addr = e.info.elf.phdr_addr; - boot->phdr_size = e.info.elf.phnum * sizeof (ElfW(Phdr)); + e.info.elf.phdr_addr += e.info.elf.loadbase; + boot->phdr_addr = e.info.elf.phdr_addr; + boot->phdr_size = e.info.elf.phnum * sizeof (ElfW(Phdr)); + } boot->user_entry = e.entry; /* already adjusted in `load' */ /* Create the initial thread. */ |