From patchwork Sun Apr 4 22:31:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 49404 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B7651B7CF6 for ; Tue, 6 Apr 2010 03:48:26 +1000 (EST) Received: from localhost ([127.0.0.1]:55760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nyq82-0000rx-V5 for incoming@patchwork.ozlabs.org; Mon, 05 Apr 2010 13:30:27 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NyptY-0005rs-SU for qemu-devel@nongnu.org; Mon, 05 Apr 2010 13:15:29 -0400 Received: from [140.186.70.92] (port=41550 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NyptR-0005nD-LP for qemu-devel@nongnu.org; Mon, 05 Apr 2010 13:15:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NyptM-0007Qu-BB for qemu-devel@nongnu.org; Mon, 05 Apr 2010 13:15:21 -0400 Received: from are.twiddle.net ([75.149.56.221]:42058) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NyptL-0007QG-Vp for qemu-devel@nongnu.org; Mon, 05 Apr 2010 13:15:16 -0400 Received: by are.twiddle.net (Postfix, from userid 5000) id 216D1DD7; Mon, 5 Apr 2010 10:15:12 -0700 (PDT) Message-Id: <541d77aa2f93f3d2b7d8004f0625da6c7b9c4f27.1270486025.git.rth@twiddle.net> In-Reply-To: References: From: Richard Henderson Date: Sun, 4 Apr 2010 15:31:23 -0700 To: qemu-devel@nongnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 10/14] linux-user: Remove partial support for a.out interpreters. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org At the bottom of the a.out support was the unimplemented load_aout_interp function. There were other portions of the support that didn't look right; when I went to look in the Linux kernel for clarification, I found that the support for such interpreters has been removed from binfmt_elf. There doesn't seem to be any reason to keep this broken support in qemu. Signed-off-by: Richard Henderson --- linux-user/elfload.c | 80 +++++-------------------------------------------- 1 files changed, 9 insertions(+), 71 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 464160a..2f15b9c 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -837,10 +837,6 @@ struct exec #define TARGET_ELF_PAGESTART(_v) ((_v) & ~(unsigned long)(TARGET_ELF_EXEC_PAGESIZE-1)) #define TARGET_ELF_PAGEOFFSET(_v) ((_v) & (TARGET_ELF_EXEC_PAGESIZE-1)) -#define INTERPRETER_NONE 0 -#define INTERPRETER_AOUT 1 -#define INTERPRETER_ELF 2 - #define DLINFO_ITEMS 12 static inline void memcpy_fromfs(void * to, const void * from, unsigned long n) @@ -848,8 +844,6 @@ static inline void memcpy_fromfs(void * to, const void * from, unsigned long n) memcpy(to, from, n); } -static int load_aout_interp(void * exptr, int interp_fd); - #ifdef BSWAP_NEEDED static void bswap_ehdr(struct elfhdr *ehdr) { @@ -1087,7 +1081,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, struct elfhdr * exec, abi_ulong load_addr, abi_ulong load_bias, - abi_ulong interp_load_addr, int ibcs, + abi_ulong interp_load_addr, struct image_info *info) { abi_ulong sp; @@ -1117,7 +1111,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, size += DLINFO_ARCH_ITEMS * 2; #endif size += envc + argc + 2; - size += (!ibcs ? 3 : 1); /* argc itself */ + size += 1; /* argc itself */ size *= n; if (size & 15) sp -= 16 - (size & 15); @@ -1159,7 +1153,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, info->saved_auxv = sp; - sp = loader_build_argptr(envc, argc, sp, p, !ibcs); + sp = loader_build_argptr(envc, argc, sp, p, 0); return sp; } @@ -1412,11 +1406,9 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, { struct elfhdr elf_ex; struct elfhdr interp_elf_ex; - struct exec interp_ex; int interpreter_fd = -1; /* avoid warning */ abi_ulong load_addr, load_bias; int load_addr_set = 0; - unsigned int interpreter_type = INTERPRETER_NONE; unsigned char ibcs2_interpreter; int i; abi_ulong mapped_addr; @@ -1430,7 +1422,6 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, abi_ulong start_code, end_code, start_data, end_data; abi_ulong reloc_func_desc = 0; abi_ulong elf_stack; - char passed_fileno[6]; ibcs2_interpreter = 0; status = 0; @@ -1480,7 +1471,6 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, end_code = 0; start_data = 0; end_data = 0; - interp_ex.a_info = 0; elf_ppnt = elf_phdata; for(i=0;i < elf_ex.e_phnum; i++) { @@ -1545,59 +1535,22 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, memset(bprm->buf, 0, BPRM_BUF_SIZE - retval); } - interp_ex = *((struct exec *) bprm->buf); /* aout exec-header */ - interp_elf_ex = *((struct elfhdr *) bprm->buf); /* elf exec-header */ + interp_elf_ex = *((struct elfhdr *) bprm->buf); } elf_ppnt++; } /* Some simple consistency checks for the interpreter */ - if (elf_interpreter){ - interpreter_type = INTERPRETER_ELF | INTERPRETER_AOUT; - - /* Now figure out which format our binary is */ - if ((N_MAGIC(interp_ex) != OMAGIC) && (N_MAGIC(interp_ex) != ZMAGIC) && - (N_MAGIC(interp_ex) != QMAGIC)) { - interpreter_type = INTERPRETER_ELF; - } - + if (elf_interpreter) { if (!elf_check_ident(&interp_elf_ex)) { - interpreter_type &= ~INTERPRETER_ELF; - } - - if (!interpreter_type) { free(elf_interpreter); free(elf_phdata); close(bprm->fd); + close(interpreter_fd); return -ELIBBAD; } } - /* OK, we are done with that, now set up the arg stuff, - and then start this sucker up */ - - { - char * passed_p; - - if (interpreter_type == INTERPRETER_AOUT) { - snprintf(passed_fileno, sizeof(passed_fileno), "%d", bprm->fd); - passed_p = passed_fileno; - - if (elf_interpreter) { - bprm->p = copy_elf_strings(1,&passed_p,bprm->page,bprm->p); - bprm->argc++; - } - } - if (!bprm->p) { - if (elf_interpreter) { - free(elf_interpreter); - } - free (elf_phdata); - close(bprm->fd); - return -E2BIG; - } - } - /* OK, This is the point of no return */ info->end_data = 0; info->end_code = 0; @@ -1729,16 +1682,9 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, end_data += load_bias; if (elf_interpreter) { - if (interpreter_type & 1) { - elf_entry = load_aout_interp(&interp_ex, interpreter_fd); - } - else if (interpreter_type & 2) { - elf_entry = load_elf_interp(&interp_elf_ex, interpreter_fd, - &interp_load_addr, bprm->buf); - } + elf_entry = load_elf_interp(&interp_elf_ex, interpreter_fd, + &interp_load_addr, bprm->buf); reloc_func_desc = interp_load_addr; - - close(interpreter_fd); free(elf_interpreter); if (elf_entry == ~((abi_ulong)0UL)) { @@ -1755,7 +1701,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, load_symbols(&elf_ex, bprm->fd, load_bias); } - if (interpreter_type != INTERPRETER_AOUT) close(bprm->fd); + close(bprm->fd); info->personality = (ibcs2_interpreter ? PER_SVR4 : PER_LINUX); #ifdef LOW_ELF_STACK @@ -1767,7 +1713,6 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, &elf_ex, load_addr, load_bias, interp_load_addr, - (interpreter_type == INTERPRETER_AOUT ? 0 : 1), info); info->load_addr = reloc_func_desc; info->start_brk = info->brk = elf_brk; @@ -2656,15 +2601,8 @@ static int elf_core_dump(int signr, const CPUState *env) return (-errno); return (0); } - #endif /* USE_ELF_CORE_DUMP */ -static int load_aout_interp(void * exptr, int interp_fd) -{ - printf("a.out interpreter not yet supported\n"); - return(0); -} - void do_init_thread(struct target_pt_regs *regs, struct image_info *infop) { init_thread(regs, infop);