From patchwork Mon Apr 23 07:51:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christophe Lyon X-Patchwork-Id: 133975 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp703365lji; Mon, 23 Apr 2018 01:00:49 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpVREAwonBgkPzc0xIobUQ/w/W6y6RCF7sBxp4xTt2Z12RnS75FTHCHCE8VcH/LWQdfK8Vc X-Received: by 10.55.75.146 with SMTP id y140mr20549056qka.222.1524470449550; Mon, 23 Apr 2018 01:00:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524470449; cv=none; d=google.com; s=arc-20160816; b=Iz2mbXaJtmmvfHMYa0n7souBmWiEg7WT/id4IXLY9UyWpeHw5BqPfDpM5dTy2YtCJI Yt4CM5Zeawn1S9dVP7G6keg4P4Wu4QJn5AC6Z+EG4BLZCK+wcJ4t4mVEe8PeAz3Q30A3 zreEnVTR6rOyQQnoUsSBqoHZsKmFxQiad7GpMK10OeyS9ru2I2f2lgrCQK9Pu+jKI2Du IBtwXm9PwELURmQqVozENEbxkQsi8k1a5/OYITfG50WM6iY9HlfHjUU1P6bZKA4Ap6j0 rVNwU6YZsm80nlMcxS46IHu8nB/KjS70zQKTimo6eFdXb4QvX04WdlICxc4diFjnZkpk JIIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=5Zsji9SoaaQBFFjtViPA+5zhfnxNSwsLAWGRGFUl99k=; b=Lt3jwDSbNOcDcWS+W1jhjIgVyxQ/voo5sW8HBplg8pdxJucGs/hccqPyzl9pRK5+le 6sPSuBGjh5d2OHX8l+SgUS1vuEJpGEsluVmEnExYmaUHNOnAfw+Li2vKqQVZNrirKmCd zx+akglvVzEXuBmNxnUCwdmQIbgMQTFSc4hxUG56TkhN6R+q03YZnpGPQ4eRJsnLLSbg jB+A8c/Lab/jReDC62dDe0XEEORcKbF8/2+dWCgIBGPSpA+c0ZFLDRQrPUgnvtB52IF1 BqvKh29BWAd9xXSZL0hpnE66lMKZuOohSTTxOs/qYfi5x/XEtiThK3sLSFqFhrDbugxQ JJKA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id n6-v6si6001171qtp.279.2018.04.23.01.00.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 23 Apr 2018 01:00:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:52189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAWP2-0004Zw-U1 for patch@linaro.org; Mon, 23 Apr 2018 04:00:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAWHx-0000L4-7O for qemu-devel@nongnu.org; Mon, 23 Apr 2018 03:53:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAWHu-0000RV-3v for qemu-devel@nongnu.org; Mon, 23 Apr 2018 03:53:29 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:33251) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fAWHt-0000RA-QP for qemu-devel@nongnu.org; Mon, 23 Apr 2018 03:53:26 -0400 Received: from pps.filterd (m0046037.ppops.net [127.0.0.1]) by mx07-.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id w3N7nTXj027816; Mon, 23 Apr 2018 09:53:21 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 2hfu2tsgy2-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 23 Apr 2018 09:53:21 +0200 Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id E362934; Mon, 23 Apr 2018 07:53:20 +0000 (GMT) Received: from Webmail-eu.st.com (sfhdag5node1.st.com [10.75.127.13]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 9131E14D5; Mon, 23 Apr 2018 07:53:20 +0000 (GMT) Received: from gnb.st.com (10.75.127.48) by SFHDAG5NODE1.st.com (10.75.127.13) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Mon, 23 Apr 2018 09:53:20 +0200 From: Christophe Lyon To: , , , , Date: Mon, 23 Apr 2018 09:51:54 +0200 Message-ID: <20180423075215.4572-4-christophe.lyon@st.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20180423075215.4572-1-christophe.lyon@st.com> References: <20180423075215.4572-1-christophe.lyon@st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.48] X-ClientProxiedBy: SFHDAG4NODE3.st.com (10.75.127.12) To SFHDAG5NODE1.st.com (10.75.127.13) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-04-23_04:, , signatures=0 X-MIME-Autoconverted: from 8bit to quoted-printable by mx07-.pphosted.com id w3N7nTXj027816 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 62.209.51.94 Subject: [Qemu-devel] [ARM/FDPIC v2 3/4] linux-user: ARM-FDPIC: Add support of FDPIC for ARM. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Add FDPIC info into image_info structure since interpreter info is on stack and needs to be saved to be accessed later on. Co-Authored-By: Mickaël Guêné Signed-off-by: Christophe Lyon -- 2.6.3 diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 76d7718..1ee1e38 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -78,6 +78,11 @@ enum { */ #define personality(pers) (pers & PER_MASK) +int info_is_fdpic(struct image_info *info) +{ + return (info->personality == PER_LINUX_FDPIC); +} + /* this flag is uneffective under linux too, should be deleted */ #ifndef MAP_DENYWRITE #define MAP_DENYWRITE 0 @@ -287,6 +292,24 @@ static inline void init_thread(struct target_pt_regs *regs, /* For uClinux PIC binaries. */ /* XXX: Linux does this only on ARM with no MMU (do we care ?) */ regs->uregs[10] = infop->start_data; + + /* Support ARM FDPIC. */ + if (info_is_fdpic(infop)) { + /* As described in the ABI document, r7 points to the loadmap info + * prepared by the kernel. If an interpreter is needed, r8 points + * to the interpreter loadmap and r9 points to the interpreter + * PT_DYNAMIC info. If no interpreter is needed, r8 is zer0, and + * r9 points to the main program PT_DYNAMIC info. */ + regs->uregs[7] = infop->loadmap_addr; + if (infop->interpreter_loadmap_addr) { + /* Executable is dynamically loaded. */ + regs->uregs[8] = infop->interpreter_loadmap_addr; + regs->uregs[9] = infop->interpreter_pt_dynamic_addr; + } else { + regs->uregs[8] = 0; + regs->uregs[9] = infop->pt_dynamic_addr; + } + } } #define ELF_NREG 18 @@ -1745,6 +1768,11 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, if (interp_info) { interp_info->other_info = info; sp = loader_build_fdpic_loadmap(interp_info, sp); + info->interpreter_loadmap_addr = interp_info->loadmap_addr; + info->interpreter_pt_dynamic_addr = interp_info->pt_dynamic_addr; + } else { + info->interpreter_loadmap_addr = 0; + info->interpreter_pt_dynamic_addr = 0; } } diff --git a/linux-user/main.c b/linux-user/main.c index 2acac36..3579f0e 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4893,6 +4893,9 @@ int main(int argc, char **argv, char **envp) env->cp15.sctlr_el[1] |= SCTLR_B; } #endif + + /* Are we running an FDPIC binary? */ + ((TaskState *)thread_cpu->opaque)->is_fdpic = info_is_fdpic(info); } #elif defined(TARGET_SPARC) { diff --git a/linux-user/qemu.h b/linux-user/qemu.h index da3b517..a2ed148 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -57,6 +57,8 @@ struct image_info { uint16_t nsegs; void *loadsegs; abi_ulong pt_dynamic_addr; + abi_ulong interpreter_loadmap_addr; + abi_ulong interpreter_pt_dynamic_addr; struct image_info *other_info; }; @@ -145,6 +147,9 @@ typedef struct TaskState { */ int signal_pending; + /* We need to know if we have an FDPIC binary to adapt signal + * syscalls. */ + int is_fdpic; } __attribute__((aligned(16))) TaskState; extern char *exec_path; @@ -182,6 +187,7 @@ abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp, int loader_exec(int fdexec, const char *filename, char **argv, char **envp, struct target_pt_regs * regs, struct image_info *infop, struct linux_binprm *); +int info_is_fdpic(struct image_info *info); uint32_t get_elf_eflags(int fd); int load_elf_binary(struct linux_binprm *bprm, struct image_info *info);