|
»
PERFORCE change 170538 for review
|
View:
New views
1 Messages
—
Rating Filter:
Alert me
|
 |
PERFORCE change 170538 for review
by Robert Watson
::
Rate this Message:
http://p4web.freebsd.org/chv.cgi?CH=170538
Change 170538 by rwatson@rwatson_vimage_client on 2009/11/12 12:21:51 Integrate ELF-related kernel code from head into capabilities branch. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/elf.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/include/elf.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/elf.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/elf.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/include/elf.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/elf.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/include/elf.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sun4v/include/elf.h#4 integrate Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/elf.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/elf.h,v 1.21 2009/03/17 12:50:16 kib Exp $ + * $FreeBSD: src/sys/amd64/include/elf.h,v 1.22 2009/10/10 15:31:24 kib Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -106,4 +106,10 @@ #define ELF_TARG_MACH EM_X86_64 #define ELF_TARG_VER 1 +#if __ELF_WORD_SIZE == 32 +#define ET_DYN_LOAD_ADDR 0x01001000 +#else +#define ET_DYN_LOAD_ADDR 0x01021000 +#endif + #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/sys/arm/include/elf.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/elf.h,v 1.10 2009/03/17 12:50:16 kib Exp $ + * $FreeBSD: src/sys/arm/include/elf.h,v 1.11 2009/10/10 15:31:24 kib Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -97,4 +97,7 @@ * value. */ #define MAGIC_TRAMP_NUMBER 0x5c000003 + +#define ET_DYN_LOAD_ADDR 0x12000 + #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/include/elf.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/elf.h,v 1.19 2009/03/17 12:50:16 kib Exp $ + * $FreeBSD: src/sys/i386/include/elf.h,v 1.20 2009/10/10 15:31:24 kib Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -105,4 +105,6 @@ #define ELF_TARG_MACH EM_386 #define ELF_TARG_VER 1 +#define ET_DYN_LOAD_ADDR 0x01001000 + #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/elf.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/elf.h,v 1.17 2009/03/17 12:50:16 kib Exp $ + * $FreeBSD: src/sys/ia64/include/elf.h,v 1.18 2009/10/10 15:31:24 kib Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -141,4 +141,6 @@ #define DT_IA_64_PLT_RESERVE 0x70000000 +#define ET_DYN_LOAD_ADDR 0x2500000000000000 + #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#10 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.200 2009/10/03 10:50:00 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.203 2009/10/18 12:57:48 kib Exp $"); #include "opt_compat.h" @@ -640,7 +640,8 @@ } 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; @@ -692,9 +693,9 @@ u_long text_size = 0, data_size = 0, total_size = 0; u_long text_addr = 0, data_addr = 0; u_long seg_size, seg_addr; - u_long addr, entry = 0, proghdr = 0; + u_long addr, baddr, et_dyn_addr, entry = 0, proghdr = 0; int32_t osrel = 0; - int error = 0, i; + int error = 0, i, n; const char *interp = NULL, *newinterp = NULL; Elf_Brandinfo *brand_info; char *path; @@ -723,14 +724,22 @@ phdr = (const Elf_Phdr *)(imgp->image_header + hdr->e_phoff); if (!aligned(phdr, Elf_Addr)) return (ENOEXEC); + n = 0; + baddr = 0; for (i = 0; i < hdr->e_phnum; i++) { + if (phdr[i].p_type == PT_LOAD) { + if (n == 0) + baddr = phdr[i].p_vaddr; + n++; + continue; + } if (phdr[i].p_type == PT_INTERP) { /* Path to interpreter */ if (phdr[i].p_filesz > MAXPATHLEN || phdr[i].p_offset + phdr[i].p_filesz > PAGE_SIZE) return (ENOEXEC); interp = imgp->image_header + phdr[i].p_offset; - break; + continue; } } @@ -740,9 +749,19 @@ hdr->e_ident[EI_OSABI]); return (ENOEXEC); } - if (hdr->e_type == ET_DYN && - (brand_info->flags & BI_CAN_EXEC_DYN) == 0) - return (ENOEXEC); + if (hdr->e_type == ET_DYN) { + if ((brand_info->flags & BI_CAN_EXEC_DYN) == 0) + return (ENOEXEC); + /* + * Honour the base load address from the dso if it is + * non-zero for some reason. + */ + if (baddr == 0) + et_dyn_addr = ET_DYN_LOAD_ADDR; + else + et_dyn_addr = 0; + } else + et_dyn_addr = 0; sv = brand_info->sysvec; if (interp != NULL && brand_info->interp_newpath != NULL) newinterp = brand_info->interp_newpath; @@ -769,6 +788,8 @@ for (i = 0; i < hdr->e_phnum; i++) { 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; @@ -788,7 +809,7 @@ if ((error = __elfN(load_section)(vmspace, imgp->object, phdr[i].p_offset, - (caddr_t)(uintptr_t)phdr[i].p_vaddr, + (caddr_t)(uintptr_t)phdr[i].p_vaddr + et_dyn_addr, phdr[i].p_memsz, phdr[i].p_filesz, prot, sv->sv_pagesize)) != 0) return (error); @@ -802,11 +823,12 @@ if (phdr[i].p_offset == 0 && hdr->e_phoff + hdr->e_phnum * hdr->e_phentsize <= phdr[i].p_filesz) - proghdr = phdr[i].p_vaddr + hdr->e_phoff; + proghdr = phdr[i].p_vaddr + hdr->e_phoff + + et_dyn_addr; - seg_addr = trunc_page(phdr[i].p_vaddr); + seg_addr = trunc_page(phdr[i].p_vaddr + et_dyn_addr); seg_size = round_page(phdr[i].p_memsz + - phdr[i].p_vaddr - seg_addr); + phdr[i].p_vaddr + et_dyn_addr - seg_addr); /* * Is this .text or .data? We can't use @@ -828,7 +850,7 @@ phdr[i].p_memsz)) { text_size = seg_size; text_addr = seg_addr; - entry = (u_long)hdr->e_entry; + entry = (u_long)hdr->e_entry + et_dyn_addr; } else { data_size = seg_size; data_addr = seg_addr; @@ -836,7 +858,7 @@ total_size += seg_size; break; case PT_PHDR: /* Program header table info */ - proghdr = phdr[i].p_vaddr; + proghdr = phdr[i].p_vaddr + et_dyn_addr; break; default: break; @@ -908,7 +930,7 @@ return (error); } } else - addr = 0; + addr = et_dyn_addr; /* * Construct auxargs table (used by the fixup routine) ==== //depot/projects/trustedbsd/capabilities/src/sys/mips/include/elf.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * JNPR: elf.h,v 1.4 2006/12/02 09:53:40 katta - * $FreeBSD: src/sys/mips/include/elf.h,v 1.4 2009/03/17 12:50:16 kib Exp $ + * $FreeBSD: src/sys/mips/include/elf.h,v 1.5 2009/10/10 15:31:24 kib Exp $ * */ @@ -250,4 +250,6 @@ #define AT_COUNT 16 /* Count of defined aux entry types. */ +#define ET_DYN_LOAD_ADDR 0x0120000 + #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/elf.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/elf.h,v 1.10 2009/03/17 12:50:16 kib Exp $ + * $FreeBSD: src/sys/powerpc/include/elf.h,v 1.11 2009/10/10 15:31:24 kib Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -96,4 +96,6 @@ #define ELF_TARG_MACH EM_PPC #define ELF_TARG_VER 1 +#define ET_DYN_LOAD_ADDR 0x01010000 + #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/sys/sparc64/include/elf.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/elf.h,v 1.17 2009/03/17 12:50:16 kib Exp $ + * $FreeBSD: src/sys/sparc64/include/elf.h,v 1.19 2009/10/18 13:08:15 marius Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -97,4 +97,6 @@ #define ELF_TARG_MACH ELF_ARCH #define ELF_TARG_VER 1 +#define ET_DYN_LOAD_ADDR 0x100000 + #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/sys/sun4v/include/elf.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sun4v/include/elf.h,v 1.4 2009/03/17 12:50:16 kib Exp $ + * $FreeBSD: src/sys/sun4v/include/elf.h,v 1.6 2009/10/18 13:08:15 marius Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -97,4 +97,6 @@ #define ELF_TARG_MACH ELF_ARCH #define ELF_TARG_VER 1 +#define ET_DYN_LOAD_ADDR 0x100000 + #endif /* !_MACHINE_ELF_H_ */ _______________________________________________ p4-projects@... mailing list http://lists.freebsd.org/mailman/listinfo/p4-projects To unsubscribe, send any mail to "p4-projects-unsubscribe@..." |
| Free embeddable forum powered by Nabble | Forum Help |
