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

-fix ELF_INTERP_NON_RELOCATABLE: 

-obey ELF_LINK_ADDR in ELF_load_file()
 -set ELF_LINK_ADDR in the probe() function if needed
-make ELF_NULL_ADDR the default, so that probe() functions dont need
 to set it explicitely
-allocate buffer for interpreter name only if needed
This commit is contained in:
drochner 2003-10-31 14:00:52 +00:00
parent c3b75d203e
commit f1aa108dd8
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/kern/exec_elf32.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: exec_elf32.c,v 1.94 2003/08/08 18:53:13 christos Exp $ */
/* $NetBSD: exec_elf32.c,v 1.95 2003/10/31 14:00:52 drochner Exp $ */
/*-
* Copyright (c) 1994, 2000 The NetBSD Foundation, Inc.
@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(1, "$NetBSD: exec_elf32.c,v 1.94 2003/08/08 18:53:13 christos Exp $");
__KERNEL_RCSID(1, "$NetBSD: exec_elf32.c,v 1.95 2003/10/31 14:00:52 drochner Exp $");
/* If not included by exec_elf64.c, ELFSIZE won't be defined. */
#ifndef ELFSIZE
@ -399,8 +399,6 @@ ELFNAME(load_file)(struct proc *p, struct exec_package *epp, char *path,
if ((error = exec_read_from(p, vp, eh.e_phoff, ph, phsize)) != 0)
goto bad;
/* this breaks on, e.g., OpenBSD-compatible mips shared binaries. */
#ifndef ELF_INTERP_NON_RELOCATABLE
/*
* If no position to load the interpreter was set by a probe
* function, pick the same address that a non-fixed mmap(0, ..)
@ -429,8 +427,7 @@ ELFNAME(load_file)(struct proc *p, struct exec_package *epp, char *path,
addr = VM_DEFAULT_ADDRESS(epp->ep_daddr,
round_page(limit) - trunc_page(base_ph->p_vaddr));
} else
#endif /* !ELF_INTERP_NON_RELOCATABLE */
addr = *last;
addr = *last; /* may be ELF_LINK_ADDR */
/*
* Load all the necessary sections
@ -452,6 +449,8 @@ ELFNAME(load_file)(struct proc *p, struct exec_package *epp, char *path,
*/
base_ph = ph0;
flags = VMCMD_BASE;
if (addr == ELF_LINK_ADDR)
addr = ph0->p_vaddr;
if (p->p_vmspace->vm_map.flags & VM_MAP_TOPDOWN)
addr = ELF_TRUNC(addr, ph0->p_align);
else
@ -574,14 +573,13 @@ ELFNAME2(exec,makecmds)(struct proc *p, struct exec_package *epp)
epp->ep_taddr = epp->ep_tsize = ELFDEFNNAME(NO_ADDR);
epp->ep_daddr = epp->ep_dsize = ELFDEFNNAME(NO_ADDR);
MALLOC(interp, char *, MAXPATHLEN, M_TEMP, M_WAITOK);
interp[0] = '\0';
for (i = 0; i < eh->e_phnum; i++) {
pp = &ph[i];
if (pp->p_type == PT_INTERP) {
if (pp->p_filesz >= MAXPATHLEN)
goto bad;
MALLOC(interp, char *, MAXPATHLEN, M_TEMP, M_WAITOK);
interp[0] = '\0';
if ((error = exec_read_from(p, epp->ep_vp,
pp->p_offset, interp, pp->p_filesz)) != 0)
goto bad;
@ -599,16 +597,15 @@ ELFNAME2(exec,makecmds)(struct proc *p, struct exec_package *epp)
* exists. Emulation packages may possibly replace the interpreter in
* interp[] with a changed path (/emul/xxx/<path>).
*/
if (!epp->ep_esch->u.elf_probe_func) {
pos = ELFDEFNNAME(NO_ADDR);
} else {
vaddr_t startp = 0;
pos = ELFDEFNNAME(NO_ADDR);
if (epp->ep_esch->u.elf_probe_func) {
vaddr_t startp = (vaddr_t)pos;
error = (*epp->ep_esch->u.elf_probe_func)(p, epp, eh, interp,
&startp);
pos = (Elf_Addr)startp;
if (error)
goto bad;
pos = (Elf_Addr)startp;
}
/*
@ -675,7 +672,7 @@ ELFNAME2(exec,makecmds)(struct proc *p, struct exec_package *epp)
* Check if we found a dynamically linked binary and arrange to load
* its interpreter
*/
if (interp[0]) {
if (interp) {
struct elf_args *ap;
int i = epp->ep_vmcmds.evs_used;
u_long interp_offset;
@ -696,6 +693,8 @@ ELFNAME2(exec,makecmds)(struct proc *p, struct exec_package *epp)
ap->arg_entry = eh->e_entry;
epp->ep_emul_arg = ap;
FREE(interp, M_TEMP);
} else
epp->ep_entry = eh->e_entry;
@ -704,7 +703,6 @@ ELFNAME2(exec,makecmds)(struct proc *p, struct exec_package *epp)
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_readvn, PAGE_SIZE, 0,
epp->ep_vp, 0, VM_PROT_READ);
#endif
FREE(interp, M_TEMP);
free(ph, M_TEMP);
return (*epp->ep_esch->es_setup_stack)(p, epp);
@ -779,6 +777,8 @@ ELFNAME2(netbsd,probe)(struct proc *p, struct exec_package *epp,
if ((error = ELFNAME2(netbsd,signature)(p, epp, eh)) != 0)
return error;
*pos = ELFDEFNNAME(NO_ADDR);
#ifdef ELF_INTERP_NON_RELOCATABLE
*pos = ELF_LINK_ADDR;
#endif
return 0;
}