From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3BA9C12002 for ; Mon, 19 Jul 2021 16:48:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ACF0261181 for ; Mon, 19 Jul 2021 16:48:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349146AbhGSQID (ORCPT ); Mon, 19 Jul 2021 12:08:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:39908 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236883AbhGSQGB (ORCPT ); Mon, 19 Jul 2021 12:06:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6993C61181; Mon, 19 Jul 2021 16:46:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626713171; bh=IhycsgjmVKMlkgcdiYd3hXgzAa0APlBc1qcD37+tygU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=twgDIGe2sindR/0+hRNwrxK0aLiok0Aky+A1Qkl8saqVCkhe8zRDAzzyQXsC9eEOF FlBa/saLecpBlJCX21q9bJIjVqK9Bem919MXF3hLG8C0MiJP/AK3anRb4iEg6NLFUX GqY0HSJ2vF7xTjIea/biDC9E4V1HbEiD47hUjETB+/ozCduyjiWgHxRYZS6olxXYZn PMG8Oh0FWVamZEF8jJcgLOCU2dEXf5rsoYX7g5GlswLuH14s2oHlbcRLNUFLgOBwoE Kkbc1HpwztVedNL1ubpWGo2JiVr/RkiiAF2Bc6fvv4lZlt4VhC91NtV7kuWVl/f4lX BmlobBwtZcVJg== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Szabolcs Nagy , Jeremy Linton , Dave Martin , "H . J . Lu" , Yu-cheng Yu , linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, libc-alpha@sourceware.org, Mark Brown , Dave Martin Subject: [PATCH v5 1/4] elf: Allow architectures to parse properties on the main executable Date: Mon, 19 Jul 2021 17:45:33 +0100 Message-Id: <20210719164536.19143-2-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210719164536.19143-1-broonie@kernel.org> References: <20210719164536.19143-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=5824; h=from:subject; bh=IhycsgjmVKMlkgcdiYd3hXgzAa0APlBc1qcD37+tygU=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBg9awtXfJzSF2l/0MqP+yAodwhBcaR2rXkhAhZ9GMs wCRPN7yJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYPWsLQAKCRAk1otyXVSH0PLwB/ 9TAIEBsnhvB9I3qT/atDGg7KeZH0N05P4xeapTq9JDsRa/V9qeEDIX6CsQu1DU2P8yzywfdzNKZxNq U5Gc2Cj3SqvO80H4zyocl1qZtNJt1G8RABeMnpmJqw/B52ngN25sh1o2GT+MsEv2zNXPLU/lG0M6pM iI2i5K40JHucnqJ81cohK6caxeVBTdLQKbbHaAIsoPpaG5N3v9e8mC6fWEb9D1mKzE6DZqEGZt0Tmg cQ2uozgG4rAIdLJzvidntKgK+6ndham84Vw+l3gYYZ6UwCgZ+r+H/RZiMgEoUfIkfUt1TjD5NSBAWc Mi21NIJLbGa9DVbdSelBlKX+gTk5k+ X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arch@vger.kernel.org Currently the ELF code only attempts to parse properties on the image that will start execution, either the interpreter or for statically linked executables the main executable. The expectation is that any property handling for the main executable will be done by the interpreter. This is a bit inconsistent since we do map the executable and is causing problems for the arm64 BTI support when used in conjunction with systemd's use of seccomp to implement MemoryDenyWriteExecute which stops the dynamic linker adjusting the permissions of executable segments. Allow architectures to handle properties for both the dynamic linker and main executable, adjusting arch_parse_elf_properties() to have a new flag is_interp flag as with arch_elf_adjust_prot() and calling it for both the main executable and any intepreter. The user of this code, arm64, is adapted to ensure that there is no functional change. Signed-off-by: Mark Brown Tested-by: Jeremy Linton Reviewed-by: Dave Martin --- arch/arm64/include/asm/elf.h | 3 ++- fs/binfmt_elf.c | 27 +++++++++++++++++++-------- include/linux/elf.h | 4 +++- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 8d1c8dcb87fd..a488a1329b16 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -261,6 +261,7 @@ struct arch_elf_state { static inline int arch_parse_elf_property(u32 type, const void *data, size_t datasz, bool compat, + bool has_interp, bool is_interp, struct arch_elf_state *arch) { /* No known properties for AArch32 yet */ @@ -273,7 +274,7 @@ static inline int arch_parse_elf_property(u32 type, const void *data, if (datasz != sizeof(*p)) return -ENOEXEC; - if (system_supports_bti() && + if (system_supports_bti() && has_interp == is_interp && (*p & GNU_PROPERTY_AARCH64_FEATURE_1_BTI)) arch->flags |= ARM64_ELF_BTI; } diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 439ed81e755a..28eaf36f145b 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -716,8 +716,9 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex, */ static int parse_elf_property(const char *data, size_t *off, size_t datasz, - struct arch_elf_state *arch, - bool have_prev_type, u32 *prev_type) + struct arch_elf_state *arch, bool has_interp, + bool is_interp, bool have_prev_type, + u32 *prev_type) { size_t o, step; const struct gnu_property *pr; @@ -751,7 +752,8 @@ static int parse_elf_property(const char *data, size_t *off, size_t datasz, *prev_type = pr->pr_type; ret = arch_parse_elf_property(pr->pr_type, data + o, - pr->pr_datasz, ELF_COMPAT, arch); + pr->pr_datasz, ELF_COMPAT, + has_interp, is_interp, arch); if (ret) return ret; @@ -764,6 +766,7 @@ static int parse_elf_property(const char *data, size_t *off, size_t datasz, #define NOTE_NAME_SZ (sizeof(GNU_PROPERTY_TYPE_0_NAME)) static int parse_elf_properties(struct file *f, const struct elf_phdr *phdr, + bool has_interp, bool is_interp, struct arch_elf_state *arch) { union { @@ -813,7 +816,8 @@ static int parse_elf_properties(struct file *f, const struct elf_phdr *phdr, have_prev_type = false; do { ret = parse_elf_property(note.data, &off, datasz, arch, - have_prev_type, &prev_type); + has_interp, is_interp, have_prev_type, + &prev_type); have_prev_type = true; } while (!ret); @@ -828,6 +832,7 @@ static int load_elf_binary(struct linux_binprm *bprm) unsigned long error; struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata = NULL; struct elf_phdr *elf_property_phdata = NULL; + struct elf_phdr *interp_elf_property_phdata = NULL; unsigned long elf_bss, elf_brk; int bss_prot = 0; int retval, i; @@ -963,12 +968,11 @@ static int load_elf_binary(struct linux_binprm *bprm) goto out_free_dentry; /* Pass PT_LOPROC..PT_HIPROC headers to arch code */ - elf_property_phdata = NULL; elf_ppnt = interp_elf_phdata; for (i = 0; i < interp_elf_ex->e_phnum; i++, elf_ppnt++) switch (elf_ppnt->p_type) { case PT_GNU_PROPERTY: - elf_property_phdata = elf_ppnt; + interp_elf_property_phdata = elf_ppnt; break; case PT_LOPROC ... PT_HIPROC: @@ -979,10 +983,17 @@ static int load_elf_binary(struct linux_binprm *bprm) goto out_free_dentry; break; } + + retval = parse_elf_properties(interpreter, + interp_elf_property_phdata, + true, true, &arch_state); + if (retval) + goto out_free_dentry; + } - retval = parse_elf_properties(interpreter ?: bprm->file, - elf_property_phdata, &arch_state); + retval = parse_elf_properties(bprm->file, elf_property_phdata, + interpreter, false, &arch_state); if (retval) goto out_free_dentry; diff --git a/include/linux/elf.h b/include/linux/elf.h index c9a46c4e183b..1c45ecf29147 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h @@ -88,13 +88,15 @@ struct arch_elf_state; #ifndef CONFIG_ARCH_USE_GNU_PROPERTY static inline int arch_parse_elf_property(u32 type, const void *data, size_t datasz, bool compat, + bool has_interp, bool is_interp, struct arch_elf_state *arch) { return 0; } #else extern int arch_parse_elf_property(u32 type, const void *data, size_t datasz, - bool compat, struct arch_elf_state *arch); + bool compat, bool has_interp, bool is_interp, + struct arch_elf_state *arch); #endif #ifdef CONFIG_ARCH_HAVE_ELF_PROT -- 2.20.1