From patchwork Sat Mar 30 00:58:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 161480 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2762605jan; Fri, 29 Mar 2019 19:25:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqwOr5Gi9NednZMh2V070W87EAllQx0DZsRx4C8UQFPmTHyzD/b6B7jNVkkWtp1Cl99VXHld X-Received: by 2002:a02:938f:: with SMTP id z15mr21837503jah.108.1553912735598; Fri, 29 Mar 2019 19:25:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553912726; cv=none; d=google.com; s=arc-20160816; b=qrJrthIO+8B9MTtBdLBwaRog2U0Puqpz3j+IbGZi8xtN+VxuUit5VAC9c05GkFW1WA u9405VJtZYoZZiy+2yDvQIZFoxp1PrILrjdA4do5/hpdXlKfsVUW2asXm17FSUbiFYQy qvxA856mVSgBDDE3jD4GSbjh9NlnK8unqvkSCXOY+WG8ND+90GGHCoVZiYhgNig5sQ4N FaeBpYKwCCYkl4jpDGeiIV9glBBwE+4y8A6Dq5tgIunaJkfkcB6c5393o0jxl4s1cks7 pNDky1XXdk17lUTvqnXIXKNLEyPN7TSWvM59stxtcUDL62n4tNTNaW3CocWYmflUE7i/ 9z8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=z4WDNajKPnmHVMuD6PXewZbG8jDBRC/myV7ZolbBuM0=; b=rBQFID61Ob8EUZsFUxQaZxce+wnPL6mpVhR1ShaVmIII57/r26A2b1aCv5do2Bs2+h guUr7uKWJXZhSlaauC0NgMY2wBaNS0X105iE+Z4BwF7vqQJ/tsl0RkCEVUuuGprkReHF 94tfDAybTk5wrziRvv0ocpy/3SPfUVfWGCvW1ozgXUH0fX6gG5Ztw2QJmcq77hrFVOzD gP/LyIsrHQ04/g/9Io6At4zsAOmApnur6fky+NGaUiLfehBF/Jbz0CzAV+XROb8dfRI7 DtlkQzJ8TQGMj2Erdh16E63X6FbtAjZfnClr7RCQQlCpUZq07SW6t5LYFDzF+aLHZx3u g7hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="y/vWxKAi"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r135si2020779ith.113.2019.03.29.19.25.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Mar 2019 19:25:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="y/vWxKAi"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:45144 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA3gT-0000M6-5F for patch@linaro.org; Fri, 29 Mar 2019 22:25:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA2L1-00078U-A2 for qemu-devel@nongnu.org; Fri, 29 Mar 2019 20:59:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hA2L0-0001eK-5D for qemu-devel@nongnu.org; Fri, 29 Mar 2019 20:59:11 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:44040) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hA2Kz-0001dv-UG for qemu-devel@nongnu.org; Fri, 29 Mar 2019 20:59:10 -0400 Received: by mail-pf1-x443.google.com with SMTP id y13so1801418pfm.11 for ; Fri, 29 Mar 2019 17:59:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z4WDNajKPnmHVMuD6PXewZbG8jDBRC/myV7ZolbBuM0=; b=y/vWxKAibAbeGtOJzGh7Ri8j9kKVy+vvb1M/YtWIjyXX3+2rw9KstdOY26eNqCjQ4l AgNOEg6bzPMSJDregUM08NHTWnhGCDIhMtTNwBezD/4eqnD0l5uG0J9uVkan4XCAemFI X15J1mZrzfUM7J6WMRNqCVS+stgTkw8WY+A0cS7196sXxjvgKv3c+YE7aodss6tZkXgv Gtz7QnW1ucX7CYBf851cqweEqiBmvAuA7PALrIakPHbIcnd6swneQH2Cy2TWW8hvw00p wErHcM6n8XigPXXMG4MKZwaN377eNac2wjbqFKX12qgIWtSzR2bHhwsUrwRKFsRIdBMR xvcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=z4WDNajKPnmHVMuD6PXewZbG8jDBRC/myV7ZolbBuM0=; b=XqDLT7wSyChpaKEed3rwpxjuPvwACs6lyp3Bzm3Dfup1/IH7Nvbme4ttoNyoiTkNH4 7YZSowkWAjVMNUsB5NhokHXTG5+Dbj80sQIhsRwRSufl4x5Z+Fw1XXLQbaihYzdtW1Ko e7tSpEn/O3Inr3AoDrKnw6qow65sfmnJathie62Iv+IZaXv2z/MFgxeJJljwaclyY2et jRGAKqSJ/I7fWsTHi2kWQfkFDyZy77U0uiFx8O2oWscMoJWJ4i4SpktFUg32Rrt85rjw UAjgbSFzFH/hnGN03atiInmZXFZdmVYrbn4nrr3Q7dmSFYWkp0bTh9Ws57uqIDhZIKqH fHzQ== X-Gm-Message-State: APjAAAWulDZpEc/eaCHpNRNcItWg2ycNxu9pDvJd/vXfpPSM6loIZWYw NHKK1WRI7FCy/W+cYGA5TzGVBoDIeew= X-Received: by 2002:a62:12c8:: with SMTP id 69mr50972449pfs.184.1553907548635; Fri, 29 Mar 2019 17:59:08 -0700 (PDT) Received: from cloudburst.ASUS (cpe-66-75-72-255.hawaii.res.rr.com. [66.75.72.255]) by smtp.gmail.com with ESMTPSA id e1sm2229900pfn.187.2019.03.29.17.59.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 17:59:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 29 Mar 2019 14:58:59 -1000 Message-Id: <20190330005900.17282-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190330005900.17282-1-richard.henderson@linaro.org> References: <20190330005900.17282-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::443 Subject: [Qemu-devel] [PATCH v4 3/4] linux-user: Parse NT_GNU_PROPERTY_TYPE_0 notes 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: , Cc: peter.maydell@linaro.org, alex.bennee@linaro.org, ramana.radhakrishnan@arm.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" For aarch64, this includes the GNU_PROPERTY_AARCH64_FEATURE_1_BTI bit, which indicates that the image should be mapped with guarded pages. Signed-off-by: Richard Henderson --- linux-user/elfload.c | 79 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 68 insertions(+), 11 deletions(-) -- 2.17.1 Reviewed-by: Peter Maydell diff --git a/linux-user/elfload.c b/linux-user/elfload.c index c1a26021f8..12ee96e5d4 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -116,6 +116,10 @@ typedef abi_uint target_gid_t; #endif typedef abi_int target_pid_t; + +#define TARGET_NT_GNU_PROPERTY_TYPE_0 5 + + #ifdef TARGET_I386 #define ELF_PLATFORM get_elf_platform() @@ -543,6 +547,10 @@ static const char *get_elf_platform(void) # define ELF_PLATFORM "aarch64" #endif +#define TARGET_GNU_PROPERTY_AARCH64_FEATURE_1_AND 0xc0000000 +#define TARGET_GNU_PROPERTY_AARCH64_FEATURE_1_BTI (1u << 0) +#define TARGET_GNU_PROPERTY_AARCH64_FEATURE_1_PAC (1u << 1) + static inline void init_thread(struct target_pt_regs *regs, struct image_info *infop) { @@ -2252,7 +2260,7 @@ static void load_elf_image(const char *image_name, int image_fd, struct elfhdr *ehdr = (struct elfhdr *)bprm_buf; struct elf_phdr *phdr; abi_ulong load_addr, load_bias, loaddr, hiaddr, error; - int i, retval; + int i, retval, prot_exec = PROT_EXEC; const char *errmsg; /* First of all, some simple consistency checks */ @@ -2287,17 +2295,66 @@ static void load_elf_image(const char *image_name, int image_fd, loaddr = -1, hiaddr = 0; info->alignment = 0; for (i = 0; i < ehdr->e_phnum; ++i) { - if (phdr[i].p_type == PT_LOAD) { - abi_ulong a = phdr[i].p_vaddr - phdr[i].p_offset; - if (a < loaddr) { - loaddr = a; + struct elf_phdr *eppnt = phdr + i; + + switch (eppnt->p_type) { + case PT_LOAD: + { + abi_ulong a = eppnt->p_vaddr - eppnt->p_offset; + if (a < loaddr) { + loaddr = a; + } + a = eppnt->p_vaddr + eppnt->p_memsz; + if (a > hiaddr) { + hiaddr = a; + } + ++info->nsegs; + info->alignment |= eppnt->p_align; } - a = phdr[i].p_vaddr + phdr[i].p_memsz; - if (a > hiaddr) { - hiaddr = a; + break; + case PT_NOTE: + { + uint32_t note[7]; + uint32_t gnu0; + + if (eppnt->p_filesz < sizeof(note)) { + break; + } + if (eppnt->p_offset + eppnt->p_filesz <= BPRM_BUF_SIZE) { + memcpy(note, bprm_buf + eppnt->p_offset, sizeof(note)); + } else { + retval = pread(image_fd, note, sizeof(note), + eppnt->p_offset); + if (retval != sizeof(note)) { + goto exit_perror; + } + } +#ifdef BSWAP_NEEDED + for (i = 0; i < ARRAY_SIZE(note); ++i) { + bswap32s(note + i); + } +#endif +#ifdef HOST_WORDS_BIGENDIAN + gnu0 = 'G' << 24 | 'N' << 16 | 'U' << 8; +#else + gnu0 = 'G' | 'N' << 8 | 'U' << 16; +#endif + + if (note[0] != 4 || /* namesz */ + note[1] < 12 || /* descsz -- may include padding */ + note[2] != TARGET_NT_GNU_PROPERTY_TYPE_0 || /* type */ + note[3] != gnu0) { /* name */ + break; + } +#ifdef TARGET_AARCH64 + if (note[4] == TARGET_GNU_PROPERTY_AARCH64_FEATURE_1_AND && + note[5] == 4 && + (note[6] & TARGET_GNU_PROPERTY_AARCH64_FEATURE_1_BTI)) { + prot_exec |= TARGET_PROT_BTI; + } +#endif } - ++info->nsegs; - info->alignment |= phdr[i].p_align; + break; } } @@ -2359,7 +2416,7 @@ static void load_elf_image(const char *image_name, int image_fd, if (eppnt->p_flags & PF_R) elf_prot = PROT_READ; if (eppnt->p_flags & PF_W) elf_prot |= PROT_WRITE; - if (eppnt->p_flags & PF_X) elf_prot |= PROT_EXEC; + if (eppnt->p_flags & PF_X) elf_prot |= prot_exec; vaddr = load_bias + eppnt->p_vaddr; vaddr_po = TARGET_ELF_PAGEOFFSET(vaddr);