From nobody Wed Feb 11 02:07:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523028186153768.180542290072; Fri, 6 Apr 2018 08:23:06 -0700 (PDT) Received: from localhost ([::1]:34029 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4TCd-0007Za-9x for importer@patchew.org; Fri, 06 Apr 2018 11:22:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4T8W-000467-Vf for qemu-devel@nongnu.org; Fri, 06 Apr 2018 11:18:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f4T8T-0004cO-OB for qemu-devel@nongnu.org; Fri, 06 Apr 2018 11:18:44 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:54306 helo=mx07-00178001.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f4T8T-0004br-FD for qemu-devel@nongnu.org; Fri, 06 Apr 2018 11:18:41 -0400 Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx08-.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id w36FF2SZ018353; Fri, 6 Apr 2018 17:18:39 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx08-00178001.pphosted.com with ESMTP id 2h1yf7pr8u-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 06 Apr 2018 17:18:39 +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 E6AAB31; Fri, 6 Apr 2018 15:18:38 +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 CC6C7A555; Fri, 6 Apr 2018 15:18:38 +0000 (GMT) Received: from gnx2104.gnb.st.com (10.75.127.51) by SFHDAG5NODE1.st.com (10.75.127.13) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Fri, 6 Apr 2018 17:18:38 +0200 From: Christophe Lyon To: , , Date: Fri, 6 Apr 2018 17:17:30 +0200 Message-ID: <20180406151752.10854-3-christophe.lyon@st.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20180406151752.10854-1-christophe.lyon@st.com> References: <20180406151752.10854-1-christophe.lyon@st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.51] X-ClientProxiedBy: SFHDAG6NODE1.st.com (10.75.127.16) To SFHDAG5NODE1.st.com (10.75.127.13) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-04-06_08:, , signatures=0 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by mx08-.pphosted.com id w36FF2SZ018353 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 91.207.212.93 Subject: [Qemu-devel] [ARM/FDPIC 2/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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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=C3=ABl Gu=C3=AAn=C3=A9 Signed-off-by: Christophe Lyon diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 7ba3795..363da67 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -287,6 +287,23 @@ 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] =3D infop->start_data; +#ifdef CONFIG_USE_FDPIC + /* Support ARM FDPIC. */ + /* 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] =3D infop->loadmap_addr; + if (infop->interpreter_loadmap_addr) { + /* Executable is dynamically loaded. */ + regs->uregs[8] =3D infop->interpreter_loadmap_addr; + regs->uregs[9] =3D infop->interpreter_pt_dynamic_addr; + } else { + regs->uregs[8] =3D 0; + regs->uregs[9] =3D infop->pt_dynamic_addr; + } +#endif } =20 #define ELF_NREG 18 @@ -1692,6 +1709,11 @@ static abi_ulong loader_build_fdpic_loadmap(struct i= mage_info *info, abi_ulong s } #endif =20 +int info_is_fdpic(struct image_info *info) +{ + return (info->personality =3D=3D PER_LINUX_FDPIC); +} + static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, struct elfhdr *exec, struct image_info *info, @@ -1719,6 +1741,11 @@ static abi_ulong create_elf_tables(abi_ulong p, int = argc, int envc, if (interp_info) { interp_info->other_info =3D info; sp =3D loader_build_fdpic_loadmap(interp_info, sp); + info->interpreter_loadmap_addr =3D interp_info->loadmap_addr; + info->interpreter_pt_dynamic_addr =3D interp_info->pt_dynamic_= addr; + } else { + info->interpreter_loadmap_addr =3D 0; + info->interpreter_pt_dynamic_addr =3D 0; } } #endif diff --git a/linux-user/main.c b/linux-user/main.c index ba09b7d..00810d6 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4868,6 +4868,11 @@ int main(int argc, char **argv, char **envp) env->cp15.sctlr_el[i] |=3D SCTLR_EE; } #endif + +#if defined(CONFIG_USE_FDPIC) + /* Are we running an FDPIC binary? */ + env->is_fdpic =3D info_is_fdpic(info); +#endif } #elif defined(TARGET_ARM) { diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 192a0d2..7eaf9e9 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -56,6 +56,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; #endif }; @@ -182,6 +184,7 @@ abi_ulong loader_build_argptr(int envc, int argc, abi_u= long 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); =20 uint32_t get_elf_eflags(int fd); int load_elf_binary(struct linux_binprm *bprm, struct image_info *info); diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 19a0c03..90c8ee1 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -629,6 +629,12 @@ typedef struct CPUARMState { const struct arm_boot_info *boot_info; /* Store GICv3CPUState to access from this struct */ void *gicv3state; + +#if defined(CONFIG_USER_ONLY) && defined(CONFIG_USE_FDPIC) + /* We need to know if we have an FDPIC binary to adapt signal + * syscalls. */ + int is_fdpic; +#endif } CPUARMState; =20 /** --=20 2.6.3