From patchwork Mon Jul 19 16:45:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 44409 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3A2D9395C064 for ; Mon, 19 Jul 2021 16:47:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3A2D9395C064 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626713235; bh=42mB+92uhgueHkpDgqbtgAjAjyiHVWo/RZPj0AazmUw=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=SxfDwbjVCtj1vfR9Z7vfyO/fbcuX9knw2DtOwuzUtEktI1CnLz8gFjO7UhBzmvXG2 5SG1exTrICHlNu3Xq91istvV1Gqzd8ZRf8lGg8Ss0w6idWITZChfMuekCqBI1rq33W v77+d9rRgqO/Un3jN2fq1qYGMjdRM/tBMJSdLQeU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by sourceware.org (Postfix) with ESMTPS id CE67B395B81A for ; Mon, 19 Jul 2021 16:46:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CE67B395B81A Received: by mail.kernel.org (Postfix) with ESMTPSA id 6993C61181; Mon, 19 Jul 2021 16:46:10 +0000 (UTC) To: Catalin Marinas , Will Deacon 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 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Mark Brown via Libc-alpha From: Mark Brown Reply-To: Mark Brown Cc: linux-arch@vger.kernel.org, Yu-cheng Yu , libc-alpha@sourceware.org, Szabolcs Nagy , Jeremy Linton , Mark Brown , Dave Martin , linux-arm-kernel@lists.infradead.org Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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 From patchwork Mon Jul 19 16:45:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 44410 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 71BEA395BC1B for ; Mon, 19 Jul 2021 16:47:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 71BEA395BC1B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626713279; bh=LXBowOkBp3Q2jqqF35GJf2KzxMorztV7KFuefEhl/dg=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=CxPpa97S80dsAIag5puiafpCFnCPklhfXc9RB0rLrtqqrUknch9WVbP5FKnEaAweD RCBPoSPR4fGwWNsPQUGju3iQNv6Q8NVcBWSGQelnWtxNTSjEwXNofNZfC90Qh/XKvl 6VSQov9y8H4aLRa0E+T4iVNPWkQc2OunLTsQMapM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by sourceware.org (Postfix) with ESMTPS id B4E77395C038 for ; Mon, 19 Jul 2021 16:46:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B4E77395C038 Received: by mail.kernel.org (Postfix) with ESMTPSA id DD5DD61221; Mon, 19 Jul 2021 16:46:13 +0000 (UTC) To: Catalin Marinas , Will Deacon Subject: [PATCH v5 2/4] arm64: Enable BTI for main executable as well as the interpreter Date: Mon, 19 Jul 2021 17:45:34 +0100 Message-Id: <20210719164536.19143-3-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=3271; h=from:subject; bh=CO++giUYoHXNfg+ZM1q/9xAugE5bMJJQr1XwojyQrKg=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBg9awtaL5taIcuRXN131n30QOb5aon69WBKpFrMP8R NHv0qSmJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYPWsLQAKCRAk1otyXVSH0MWMB/ 9DozwfDb3Ukp7lF1mA8M89pvNhCZtoUzvO2dgWfrJILsc/3NiaAI/DVuxuQs/J65X1iMcJ7a95u4la 1GZuZ1Qw5UMWeOu8uSKZn3i9zqopZp8p911btB695cusfSuCRvq22pJ5vxrYuiumdA3R7LCaMQ2hAz +Yoy5pYO+luv4pnogNrq/J7wYmU940IgL55RDypBRtwhVVs+PbU/7tJ//pgPbZkbvVgJEwFhOBDEsf G3d+TR9OTWp0Ifp+kvLAULsrnTy0BoRIHehWZhl5tcyK2sXMXv/B1CMaMArZQieX69o7RWObwi7dvW WtYohV71JPes/5mHmYOGXT1WyPgPPK X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Mark Brown via Libc-alpha From: Mark Brown Reply-To: Mark Brown Cc: linux-arch@vger.kernel.org, Yu-cheng Yu , libc-alpha@sourceware.org, Szabolcs Nagy , Jeremy Linton , Mark Brown , Dave Martin , linux-arm-kernel@lists.infradead.org Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Currently for dynamically linked ELF executables we only enable BTI for the interpreter, expecting the interpreter to do this for the main executable. This is a bit inconsistent since we do map main executable and is causing issues with systemd's MemoryDenyWriteExecute feature which is implemented using a seccomp filter which prevents setting PROT_EXEC on already mapped memory and lacks the context to be able to detect that memory is already mapped with PROT_EXEC. Resolve this by checking the BTI property for the main executable and enabling BTI if it is present when doing the initial mapping. This does mean that we may get more code with BTI enabled if running on a system without BTI support in the dynamic linker, this is expected to be a safe configuration and testing seems to confirm that. It also reduces the flexibility userspace has to disable BTI but it is expected that for cases where there are problems which require BTI to be disabled it is more likely that it will need to be disabled on a system level. Signed-off-by: Mark Brown Reviewed-by: Dave Martin Tested-by: Jeremy Linton --- arch/arm64/include/asm/elf.h | 15 ++++++++++++--- arch/arm64/kernel/process.c | 14 ++------------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index a488a1329b16..43b10fd04467 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -253,12 +253,21 @@ struct arch_elf_state { int flags; }; -#define ARM64_ELF_BTI (1 << 0) +#define ARM64_ELF_INTERP_BTI (1 << 0) +#define ARM64_ELF_EXEC_BTI (1 << 1) #define INIT_ARCH_ELF_STATE { \ .flags = 0, \ } +static inline int arm64_elf_bti_flag(bool is_interp) +{ + if (is_interp) + return ARM64_ELF_INTERP_BTI; + else + return ARM64_ELF_EXEC_BTI; +} + static inline int arch_parse_elf_property(u32 type, const void *data, size_t datasz, bool compat, bool has_interp, bool is_interp, @@ -274,9 +283,9 @@ static inline int arch_parse_elf_property(u32 type, const void *data, if (datasz != sizeof(*p)) return -ENOEXEC; - if (system_supports_bti() && has_interp == is_interp && + if (system_supports_bti() && (*p & GNU_PROPERTY_AARCH64_FEATURE_1_BTI)) - arch->flags |= ARM64_ELF_BTI; + arch->flags |= arm64_elf_bti_flag(is_interp); } return 0; diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index c8989b999250..2645bc79b35e 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -686,18 +686,8 @@ core_initcall(tagged_addr_init); int arch_elf_adjust_prot(int prot, const struct arch_elf_state *state, bool has_interp, bool is_interp) { - /* - * For dynamically linked executables the interpreter is - * responsible for setting PROT_BTI on everything except - * itself. - */ - if (is_interp != has_interp) - return prot; - - if (!(state->flags & ARM64_ELF_BTI)) - return prot; - - if (prot & PROT_EXEC) + if ((prot & PROT_EXEC) && + (state->flags & arm64_elf_bti_flag(is_interp))) prot |= PROT_BTI; return prot; From patchwork Mon Jul 19 16:45:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 44411 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E02BF395CC03 for ; Mon, 19 Jul 2021 16:48:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E02BF395CC03 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626713323; bh=UUJdZR4ZzxwSZ8P4u1fISmaUDGbYhx53bKvTaJNLpbU=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=mLH0u7ye5BXfO2u8vxu+MDUTnxOroSJHFvEEP+7hAUamYFpFHnSMITH0uiaUi5+X5 f+djG1yV0fsxAKWv2z943Jm5XVVvZo8gy1gZxIxnaDQ5jPcjAhYIbkOtrJM5+7igY4 fY44SqRr6oLpIYAmarwYXWS3hCIYfU4Czg/F88xo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by sourceware.org (Postfix) with ESMTPS id A3DAD395C809 for ; Mon, 19 Jul 2021 16:46:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A3DAD395C809 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3EFB461245; Mon, 19 Jul 2021 16:46:17 +0000 (UTC) To: Catalin Marinas , Will Deacon Subject: [PATCH v5 3/4] elf: Remove has_interp property from arch_adjust_elf_prot() Date: Mon, 19 Jul 2021 17:45:35 +0100 Message-Id: <20210719164536.19143-4-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=2253; h=from:subject; bh=Ct5yJFpFuVch2Ey0mQXeG/FiXFyh3RZPLWGYibJt980=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBg9awux0UYSgSoCn8xj5dLcWfxWqQX2Eru7YRJBEh1 3DMw5I+JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYPWsLgAKCRAk1otyXVSH0O1ZB/ 96l6r7AMYYfDzNEc+gZqOkAUWQGyzAo7IhbjpMxYpk3PFHt8GNGw+371TGtW814kATkSz2OdLSQAKw QNsIByYWi96HV8Es4j53IBIptN40vg1x2OUrzc7FDTLAvsmedf2pGErGrJZFf3DeYYWliKnpFmvHFn sL1o78pOS2IaiGLCrZO4MXwLu2uE7+s1cgoxNQtwU/8hU2/80tlRu5fRe/txj41xeqy7sHCylYAI3P QY7nxAKk1MdSUmwRVs17EmatlY66Du9Nrytuoebxbm0Jm6sYsx8M7K+DeldgYpBFYDxHd0wg2yVdFJ Au5m7z9OPStNdSNQOAmcgqaGiLXlLZ X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Mark Brown via Libc-alpha From: Mark Brown Reply-To: Mark Brown Cc: linux-arch@vger.kernel.org, Yu-cheng Yu , libc-alpha@sourceware.org, Szabolcs Nagy , Jeremy Linton , Mark Brown , Dave Martin , linux-arm-kernel@lists.infradead.org Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Since we have added an is_interp flag to arch_parse_elf_property() we can drop the has_interp flag from arch_elf_adjust_prot(), the only user was the arm64 code which no longer needs it and any future users will be able to use arch_parse_elf_properties() to determine if an interpreter is in use. Signed-off-by: Mark Brown Tested-by: Jeremy Linton Reviewed-By: Dave Martin --- arch/arm64/kernel/process.c | 2 +- fs/binfmt_elf.c | 2 +- include/linux/elf.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 2645bc79b35e..14478c5b52d3 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -684,7 +684,7 @@ core_initcall(tagged_addr_init); #ifdef CONFIG_BINFMT_ELF int arch_elf_adjust_prot(int prot, const struct arch_elf_state *state, - bool has_interp, bool is_interp) + bool is_interp) { if ((prot & PROT_EXEC) && (state->flags & arm64_elf_bti_flag(is_interp))) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 28eaf36f145b..4f3bea1a697c 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -580,7 +580,7 @@ static inline int make_prot(u32 p_flags, struct arch_elf_state *arch_state, if (p_flags & PF_X) prot |= PROT_EXEC; - return arch_elf_adjust_prot(prot, arch_state, has_interp, is_interp); + return arch_elf_adjust_prot(prot, arch_state, is_interp); } /* This is much more generalized than the library routine read function, diff --git a/include/linux/elf.h b/include/linux/elf.h index 1c45ecf29147..d8392531899d 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h @@ -101,11 +101,11 @@ extern int arch_parse_elf_property(u32 type, const void *data, size_t datasz, #ifdef CONFIG_ARCH_HAVE_ELF_PROT int arch_elf_adjust_prot(int prot, const struct arch_elf_state *state, - bool has_interp, bool is_interp); + bool is_interp); #else static inline int arch_elf_adjust_prot(int prot, const struct arch_elf_state *state, - bool has_interp, bool is_interp) + bool is_interp) { return prot; } From patchwork Mon Jul 19 16:45:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 44412 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5FDCD3969800 for ; Mon, 19 Jul 2021 16:49:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5FDCD3969800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626713368; bh=aCp/TIiM2wfCl2y2XKz4NPs1BtJ7UuNzOEYky/fHnbs=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=G7EK9hcyg0wkRyWlptImPIbGJZkn3Iq5zBLC8frUFroQAI0ysY5jSkQTgcQRWwKTA uOsm1NGa0FsKPHSPL6fDD9xPoMTlZ+KOIE3Fliffjd0EJyEvKdulf7BZlT+v4Nzdfs ttYLGtP++Gi7qzpjk4QAMWoUaBndCAX9XQpdcUaM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by sourceware.org (Postfix) with ESMTPS id C981A395C000 for ; Mon, 19 Jul 2021 16:46:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C981A395C000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4093F611F2; Mon, 19 Jul 2021 16:46:20 +0000 (UTC) To: Catalin Marinas , Will Deacon Subject: [PATCH v5 4/4] elf: Remove has_interp property from arch_parse_elf_property() Date: Mon, 19 Jul 2021 17:45:36 +0100 Message-Id: <20210719164536.19143-5-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=2173; h=from:subject; bh=xgmswHaaDjiYO/29SYz5Q16qNtOA0Zo6sNUvA4c37C0=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBg9awvXgY1VJFTWSLZBweaBcwQZvplDUfcRo5H5J4P dD9gaUeJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYPWsLwAKCRAk1otyXVSH0L33B/ 9sTaTyQ0Kq64HnBsreB3L+Ff2x5ejY8EVL8ag/r9aMetT9RN0pFj6Ycj9gjcvqkeam7xFEMwUNJVNA E/zhf33RyxZl7mii2RDH/DLP9XvH6z2j49Kj20wjz3W4AAnM50rL1ikioqcqPdMtzJvyiSabdkk7vc rC8QVf5lOnWfe96Z5X2IY6UhIdWg3MiPIwJC591sc8i5UrHcWZirZ8myLd+J5aoSldsA4mb533x4v3 wrLPw8NBfD1CtXPvcWvebwFoap0HSdaf5QMOUdnY1iaDQB/Ru1gThJgjeiEnIQDNn5ExPHTFMIoNOl 1JnPwU1iWk+goBqL3MB0sXgk9lsXtj X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Mark Brown via Libc-alpha From: Mark Brown Reply-To: Mark Brown Cc: linux-arch@vger.kernel.org, Yu-cheng Yu , libc-alpha@sourceware.org, Szabolcs Nagy , Jeremy Linton , Mark Brown , Dave Martin , linux-arm-kernel@lists.infradead.org Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Since all current users of arch_parse_elf_property() are able to treat the interpreter and main executable orthogonaly the has_interp argument is now redundant so remove it. Signed-off-by: Mark Brown Tested-by: Jeremy Linton Reviewed-By: Dave Martin --- arch/arm64/include/asm/elf.h | 2 +- fs/binfmt_elf.c | 2 +- include/linux/elf.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 43b10fd04467..43f2ee69a7de 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -270,7 +270,7 @@ static inline int arm64_elf_bti_flag(bool is_interp) static inline int arch_parse_elf_property(u32 type, const void *data, size_t datasz, bool compat, - bool has_interp, bool is_interp, + bool is_interp, struct arch_elf_state *arch) { /* No known properties for AArch32 yet */ diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 4f3bea1a697c..e3beaf4345cd 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -753,7 +753,7 @@ static int parse_elf_property(const char *data, size_t *off, size_t datasz, ret = arch_parse_elf_property(pr->pr_type, data + o, pr->pr_datasz, ELF_COMPAT, - has_interp, is_interp, arch); + is_interp, arch); if (ret) return ret; diff --git a/include/linux/elf.h b/include/linux/elf.h index d8392531899d..cdb080d4b34a 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h @@ -88,14 +88,14 @@ 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, + 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, bool has_interp, bool is_interp, + bool compat, bool is_interp, struct arch_elf_state *arch); #endif