From patchwork Fri Jun 4 11:17:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 1487745 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=TcxJ/Jpv; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FxL0r68XVz9sRf for ; Fri, 4 Jun 2021 21:20:44 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EBE3D384843B for ; Fri, 4 Jun 2021 11:20:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EBE3D384843B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1622805643; bh=JNBbMaTJbGCw+m4XW5G/L0AXVtcGVm64bM8DQ+xYUm0=; 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=TcxJ/Jpv+clk+K+jYhb8gGXQQQCr+dezQpMMm6r6Q7PiG1VgzBX35qczTTHAFe06V 67N6DDP5w47ez6rdaMyHxNZnbOk4tdsd8bJ9mrCifFxgt8X9wSzIlEteagAMSJrJKP Jy1PO/wXR9L5vv+EDgg26CaeslSbrB03htr6A04A= 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 360F9384841B for ; Fri, 4 Jun 2021 11:19:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 360F9384841B Received: by mail.kernel.org (Postfix) with ESMTPSA id CB2956136E; Fri, 4 Jun 2021 11:19:43 +0000 (UTC) To: Catalin Marinas , Will Deacon Subject: [PATCH v1 1/3] elf: Allow architectures to parse properties on the main executable Date: Fri, 4 Jun 2021 12:17:26 +0100 Message-Id: <20210604111728.12052-2-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210604111728.12052-1-broonie@kernel.org> References: <20210604111728.12052-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=5627; h=from:subject; bh=LNACwJUpIU4MPbvpihqdu3nHssLIcfhkB5anWmhpnGw=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBgugvEyEMyESqgyCI9Tpe30MOzC1TtuJIcNi2nFECQ SYLC/N2JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYLoLxAAKCRAk1otyXVSH0GXmB/ 9YEIN7xDqstpSVode4HvQGjKaEdi3mnC6lsuk1UClSwMvb+8atgdF+xHo9fRxY0BW2OkLOG+oCp/6o uQEkPdIyfDOWRbfoSXLAS4BR3wsUS7JrTvQT4iaUErvBqO+PGvaQJOp3+N38yZtqelqioB5hatJeY1 CI8RnEC6Vz70fmrXxAU6XPDRqXQyjwWFPRH0dIKf6kBYdKutCX0REMUrg5+r0Zv7q59ZWhrcnmIi1G NXf4eQ6wLf54BP24z1AqJk1FB7aONVFCotPASoyPpxtjfLTYcT7Wxb4nu1kR9lfO4JfxHC+m+VVxFf dp89zvMWwjUS/T3ebHlYYSwqH93bU1 X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-10.2 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.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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+incoming=patchwork.ozlabs.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 an is_interp flag as with arch_elf_adjust_prot() and calling it for both the main executable and any intepreter. Signed-off-by: Mark Brown --- 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 187b3f2b9202..253ca9969345 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 Fri Jun 4 11:17:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 1487747 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=tk+kqEHZ; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FxL2Y5X7Sz9sRf for ; Fri, 4 Jun 2021 21:22:13 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AE9E8399A850 for ; Fri, 4 Jun 2021 11:22:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AE9E8399A850 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1622805731; bh=XHjZqU18z3nrmyx5yE8KXAGFGEzK2mBz/9N3glepKHI=; 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=tk+kqEHZ6/4qxpBlSWP3LS1wH/2XYMo2TN2DPxCgmMsZCihYVeHtye61j9bXhL46p vgGiqjQ6bnkzvuHDZbsaLHistbYcJBLJ4lBxFZcMQozJ6IyPAdKUZasLjNNYcC1Jv1 BiF2ZDVLtZaYCpZwBuJgrPPW2wNtuAaIThvuEHQQ= 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 C0887399A852 for ; Fri, 4 Jun 2021 11:19:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C0887399A852 Received: by mail.kernel.org (Postfix) with ESMTPSA id 759C361414; Fri, 4 Jun 2021 11:19:46 +0000 (UTC) To: Catalin Marinas , Will Deacon Subject: [PATCH v1 2/3] arm64: Enable BTI for main executable as well as the interpreter Date: Fri, 4 Jun 2021 12:17:27 +0100 Message-Id: <20210604111728.12052-3-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210604111728.12052-1-broonie@kernel.org> References: <20210604111728.12052-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3182; h=from:subject; bh=YIMcXq5zjPTU6TnWkCaebLW4hx7QitAn2BiMS6aUhsU=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBgugvFd6SBiufM2R00KzOUZstotWdq3dPQbkCl/0c/ dJZN8kGJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYLoLxQAKCRAk1otyXVSH0MW+B/ 4yqcJtFuYqviGWjfdRvSgY1i8gr0R6YPB1OB/1kItH5G67EBE6Jt9nEIxdnF8L+neLE+CWXb0+cJbz eB1K6ync2IvC83H8huyA+yX/zbtBd9+KraODNo0VsDbOl/2Z4DuVHEZDBSZMn7SapOJ0z26oD3QIlH 4TcH11vjuY8wfCByMnRnERUgPtQ2mWPENyIseZ8jd2kcR91sN9eNpn+w50RE7eZwfMUPhTFBwuCDse eWoB0onQLrPe8+H5QKvYIw4WaA7bzn3o5SBx3CzrafsXUf7EQNSoPpVAH12Ah3Pjvbf2jqs3SZIJHo G5vF+sdFKXBhUHNO3vR1/suuYNhEJm X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-10.6 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.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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+incoming=patchwork.ozlabs.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 --- arch/arm64/include/asm/elf.h | 14 ++++++++++---- arch/arm64/kernel/process.c | 18 ++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index a488a1329b16..9f86dbce2680 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -253,7 +253,8 @@ 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, \ @@ -274,9 +275,14 @@ 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 && - (*p & GNU_PROPERTY_AARCH64_FEATURE_1_BTI)) - arch->flags |= ARM64_ELF_BTI; + if (system_supports_bti() && + (*p & GNU_PROPERTY_AARCH64_FEATURE_1_BTI)) { + if (is_interp) { + arch->flags |= ARM64_ELF_INTERP_BTI; + } else { + arch->flags |= ARM64_ELF_EXEC_BTI; + } + } } return 0; diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index b4bb67f17a2c..f7fff4a4c99f 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -744,19 +744,13 @@ asmlinkage void __sched arm64_preempt_schedule_irq(void) 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 (prot & PROT_EXEC) { + if (state->flags & ARM64_ELF_INTERP_BTI && is_interp) + prot |= PROT_BTI; - if (!(state->flags & ARM64_ELF_BTI)) - return prot; - - if (prot & PROT_EXEC) - prot |= PROT_BTI; + if (state->flags & ARM64_ELF_EXEC_BTI && !is_interp) + prot |= PROT_BTI; + } return prot; } From patchwork Fri Jun 4 11:17:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 1487746 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=i66M4axL; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FxL1j35r4z9sRf for ; Fri, 4 Jun 2021 21:21:29 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7B8BB384841B for ; Fri, 4 Jun 2021 11:21:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7B8BB384841B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1622805687; bh=nYztSiRMhzpf/tibVt1Z2HmaFhueAMPG3402ObePZX0=; 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=i66M4axLuUEayfSSj3rNabFSvYAFVq59tM1C7LW/HDZkWLTk5QJ5o0CfHoF8Ihnwp h2zYWG8g5slCNPl77XKdxz6iTXRcZauesGwaRh16n5AzcIsfDJae18wxgH/56T6QC1 b3BM19jF0ErMA+07QuckBBSbYX2HdD7H7Y9oMb3M= 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 51AB7399A438 for ; Fri, 4 Jun 2021 11:19:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 51AB7399A438 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1E0C661369; Fri, 4 Jun 2021 11:19:48 +0000 (UTC) To: Catalin Marinas , Will Deacon Subject: [PATCH v1 3/3] elf: Remove has_interp property from arch_adjust_elf_prot() Date: Fri, 4 Jun 2021 12:17:28 +0100 Message-Id: <20210604111728.12052-4-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210604111728.12052-1-broonie@kernel.org> References: <20210604111728.12052-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2180; h=from:subject; bh=UxOvTvzvIffM4aLRyIgntP4GHd3vzv87L8DyM4UTxII=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBgugvGgxS2Ievr7XanpFMsUXQrjmHCG+84nNMfLRYx Xh+d8u+JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYLoLxgAKCRAk1otyXVSH0EvGB/ 0SiN3dB15TvJjFGpyBYQOl4uvmqL4yoqy5xVxvly1OeoKESMck3T9qgBRQjj7Jl2a59iC1HY/ZUofS AHUFsO7ig4+IWBmVOPoaQ5C9+k4QTpHMTOEDp0t+KconcL4gH5Et08MGvAKu0QfUYUYfXYFNcS5EFp 33wzB5/bH7X2doVm/EkhzRjXn43Lm0PZtgly5DrD0yb/BsAWzgWnphhoTbqlkH691fC46ROH2wBKwG zDQ7HmEa3Zh7S22JUpIEIht0wEWvKGXTwMteJXNBLfvy03Ipj0ZciRere40AdDdcknzZ0hyQ4gGjU8 h0FzzQMAWnEm6vIG03qNmvx/pHTdSl X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-10.4 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.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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+incoming=patchwork.ozlabs.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 --- 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 f7fff4a4c99f..e51c4aa7e048 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -742,7 +742,7 @@ asmlinkage void __sched arm64_preempt_schedule_irq(void) #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) { if (state->flags & ARM64_ELF_INTERP_BTI && is_interp) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 253ca9969345..1aba4e50e651 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; }