From c350568db130cab12ad1adb68eb097014544c745 Mon Sep 17 00:00:00 2001 From: John Marino Date: Tue, 10 May 2011 21:39:01 +0200 Subject: [PATCH] kernel ELF: Do not map segments of zero length From FreeBSD svn 197932 (10 OCT 2009) --- sys/kern/imgact_elf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 528409f6dd..7c78ae42fc 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -447,7 +447,8 @@ __elfN(load_file)(struct proc *p, const char *file, u_long *addr, u_long *entry) phdr = (const Elf_Phdr *)(imgp->image_header + hdr->e_phoff); for (i = 0, numsegs = 0; i < hdr->e_phnum; i++) { - if (phdr[i].p_type == PT_LOAD) { /* Loadable segment */ + if (phdr[i].p_type == PT_LOAD && phdr[i].p_memsz != 0) { + /* Loadable segment */ prot = 0; if (phdr[i].p_flags & PF_X) prot |= VM_PROT_EXECUTE; @@ -639,6 +640,8 @@ __CONCAT(exec_,__elfN(imgact))(struct image_params *imgp) switch (phdr[i].p_type) { case PT_LOAD: /* Loadable segment */ + if (phdr[i].p_memsz == 0) + break; prot = 0; if (phdr[i].p_flags & PF_X) prot |= VM_PROT_EXECUTE; -- 2.41.0