Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow ELF objects with more than two PT_LOAD sections. Go creates such

Browse Source 
binaries by default with separate sections for executable, writeable
data and constants. Use the same heuristic as FreeBSD to match up the
text and data segment assumptions.
This commit is contained in:
joerg 2010-08-20 14:59:53 +00:00
parent 222d798a76
commit e84862bd9b
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/kern/exec_elf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: exec_elf.c,v 1.23 2010/06/24 13:03:11 hannken Exp $ */ /* $NetBSD: exec_elf.c,v 1.24 2010/08/20 14:59:53 joerg Exp $ */
/*- /*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc. * Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@ -57,7 +57,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.23 2010/06/24 13:03:11 hannken Exp $"); __KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.24 2010/08/20 14:59:53 joerg Exp $");
#ifdef _KERNEL_OPT #ifdef _KERNEL_OPT
#include "opt_pax.h" #include "opt_pax.h"
@ -730,28 +730,22 @@ exec_elf_makecmds(struct lwp *l, struct exec_package *epp)
switch (ph[i].p_type) { switch (ph[i].p_type) {
case PT_LOAD: case PT_LOAD:
/*
* XXX
* Can handle only 2 sections: text and data
*/
if (nload++ == 2) {
error = ENOEXEC;
goto bad;
}
elf_load_psection(&epp->ep_vmcmds, epp->ep_vp, elf_load_psection(&epp->ep_vmcmds, epp->ep_vp,
&ph[i], &addr, &size, &prot, VMCMD_FIXED); &ph[i], &addr, &size, &prot, VMCMD_FIXED);
/* /*
* Decide whether it's text or data by looking * Consider this as text segment, if it is executable.
* at the entry point. * If there is more than one text segment, pick the
* largest.
*
* If it is not executable, use the last section
* as data segment to make break() happy.
*/ */
if (eh->e_entry >= addr && if (ph[i].p_flags & PF_X) {
eh->e_entry < (addr + size)) { if (epp->ep_taddr == ELFDEFNNAME(NO_ADDR) ||
epp->ep_taddr = addr; size > epp->ep_tsize) {
epp->ep_tsize = size; epp->ep_taddr = addr;
if (epp->ep_daddr == ELFDEFNNAME(NO_ADDR)) { epp->ep_tsize = size;
epp->ep_daddr = addr;
epp->ep_dsize = size;
} }
} else { } else {
epp->ep_daddr = addr; epp->ep_daddr = addr;
@ -780,6 +774,11 @@ exec_elf_makecmds(struct lwp *l, struct exec_package *epp)
} }
} }
if (epp->ep_daddr == ELFDEFNNAME(NO_ADDR)) {
epp->ep_daddr = epp->ep_taddr;
epp->ep_dsize = epp->ep_tsize;
}
/* /*
* Check if we found a dynamically linked binary and arrange to load * Check if we found a dynamically linked binary and arrange to load
* its interpreter * its interpreter