From patchwork Mon Jul 12 11:52:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 44314 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 B4674388801C for ; Mon, 12 Jul 2021 11:58:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B4674388801C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626091091; bh=JKzgg5ZWE3Dhbr5GT4DdSYBJ5EisTHZsEFYazM1/7D4=; 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=ZVD6lhz1W4kgBFKVfl+B18z5lyyecr8E9fN+hCsUU3mTmG1n+IAkqX5fJh8DOnsG4 YkGALWnJKI0e07bWvEgUGQCWWa/HPu9IOFCRXxRKH70SP+YXdrUiP3g66t0KXcxgw+ zv95dpJFMV7CFnxJSwPpqSqs40WXty+PkUIFZkZw= 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 03303388880E for ; Mon, 12 Jul 2021 11:56:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 03303388880E Received: by mail.kernel.org (Postfix) with ESMTPSA id 93CC561106; Mon, 12 Jul 2021 11:56:57 +0000 (UTC) To: Catalin Marinas , Will Deacon Subject: [PATCH v4 1/4] elf: Allow architectures to parse properties on the main executable Date: Mon, 12 Jul 2021 12:52:56 +0100 Message-Id: <20210712115259.29547-2-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712115259.29547-1-broonie@kernel.org> References: <20210712115259.29547-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=6014; h=from:subject; bh=UuQT7MuELYKmhnUM/9E0W1LTcaYRAh38M3lJ7n5Epv8=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBg7C0XKSWKoWKSPHkFHbhY+rhHSEcUKON/1AdxApOU nvYqkrSJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYOwtFwAKCRAk1otyXVSH0GJxB/ 9mSG7Xe92bWYUDIopC1+wKTpxWK4nG+sycce8CuhIXxW8QLi8ooPOVa1Qs4izOFt9X9AeegUHpVGYE u0E+xku3/B+eANTaX6S3gZ2OAWfsDG6bRcwYzbB6vyEaD+TDrb7IZBEfv+1VQMlM7FEvEZDOMJ7ozA yqXvs/f5+YKwAVy1VXVEOGeP/LRVq9cfp+F6Bm/3MuVlDyEKUPGw2wDdZ4ml8ejvkVkwu9/KPxpYKi 5KyuZ31x6nqLxE5l39GIXf3UXV59BmrVHW2NVKywqWk6gTkg0GpBcUmn9VvDex+mTYo073rtEJAvGE rg5Pp70euJ182MNT1Nc5xl9f6rFq1R X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-11.1 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 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 Tested-by: Jeremy Linton Reviewed-by: Dave Martin --- arch/arm64/include/asm/elf.h | 3 ++- fs/binfmt_elf.c | 31 +++++++++++++++++++++++-------- include/linux/elf.h | 4 +++- 3 files changed, 28 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..81e151a57df2 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; @@ -936,6 +941,10 @@ static int load_elf_binary(struct linux_binprm *bprm) executable_stack = EXSTACK_DISABLE_X; break; + case PT_GNU_PROPERTY: + elf_property_phdata = elf_ppnt; + break; + case PT_LOPROC ... PT_HIPROC: retval = arch_elf_pt_proc(elf_ex, elf_ppnt, bprm->file, false, @@ -963,12 +972,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 +987,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 != NULL, 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 12 11:52:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 44315 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 F11CF3888816 for ; Mon, 12 Jul 2021 11:58:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F11CF3888816 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626091136; bh=BLq+re303qqzBsTmldiqf7KdJbEksKntSbjqUYr9Dvo=; 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=t6aFGp4wngLVlSj3vwD0rZiYJeY/Jd4m8kSqZyT1/lDyJa0ZUv7fBgj7HxOjUYTrj v61em7sNHccpyMHSKygSWY3+TirpNOPLiEBGWv51LIUHHC3Y2m2aUx++TB+GsOii2c GOmkXq3gP7NSt2ZY2PxUlpI3Pxgt6WXfYsFMZmIg= 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 C60C9388881B for ; Mon, 12 Jul 2021 11:57:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C60C9388881B Received: by mail.kernel.org (Postfix) with ESMTPSA id 43353610E6; Mon, 12 Jul 2021 11:57:00 +0000 (UTC) To: Catalin Marinas , Will Deacon Subject: [PATCH v4 2/4] arm64: Enable BTI for main executable as well as the interpreter Date: Mon, 12 Jul 2021 12:52:57 +0100 Message-Id: <20210712115259.29547-3-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712115259.29547-1-broonie@kernel.org> References: <20210712115259.29547-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3439; h=from:subject; bh=ljZ0Ar2vQIoqNXA7Uu8g3LQE3bTDHREWhpRUBkTTMGg=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBg7C0YxbctBBxOVXO1gju9IJD3nnsiskpsDgry/8qL T29c1jyJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYOwtGAAKCRAk1otyXVSH0NIkB/ 9n5vaAL44C15qVYFgOjjvf719q5n45OMOlh1nk74wIXKSibe+6LIW1wFhO6YzeREAflnsZuSk1JlEC iWSFi9qYRPtVWZgiGeAYkHoDZb+3TNOqNXn41CqOJhRJQkOrymep3MluBuP4vZxT2m0MERBAIgeSOP j7La7EJrzm/7HI54AAHz0nOMaPxhU7yCRZJ3jYFGXgLih+w/4c8FmAt23IJhiFDmwqtA404f78GqZz RhqRo5haCq4sOqzhlMkIGQXvjzJT6wiXE7hYi9Tcv9P5JWsnUOU+ugJ6Zh8lPQiaok7jwwWTQvoFm/ +eceAnAajaB+Wi1TDE2CzobBQj05zO X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-11.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.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 Reviewed-by: Dave Martin --- arch/arm64/include/asm/elf.h | 14 ++++++++++---- arch/arm64/kernel/process.c | 23 +++++++++++------------ 2 files changed, 21 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 c8989b999250..5a6c3b198bd3 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -683,21 +683,20 @@ core_initcall(tagged_addr_init); #endif /* CONFIG_ARM64_TAGGED_ADDR_ABI */ #ifdef CONFIG_BINFMT_ELF -int arch_elf_adjust_prot(int prot, const struct arch_elf_state *state, - bool has_interp, bool is_interp) +static inline int arm64_elf_bti_flag(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 (is_interp) + return ARM64_ELF_INTERP_BTI; + else + return ARM64_ELF_EXEC_BTI; +} - if (!(state->flags & ARM64_ELF_BTI)) - return prot; - if (prot & PROT_EXEC) +int arch_elf_adjust_prot(int prot, const struct arch_elf_state *state, + bool has_interp, bool is_interp) +{ + if ((prot & PROT_EXEC) && + (state->flags & arm64_elf_bti_flag(is_interp))) prot |= PROT_BTI; return prot; From patchwork Mon Jul 12 11:52:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 44316 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 564033888830 for ; Mon, 12 Jul 2021 11:59:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 564033888830 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626091180; bh=blpKZaPvLyQkYBH1Us41upMM6J7LCCTi1NJOGEcKrCk=; 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=dduuygu7QYBkTq9Nur7G9d4K/A7Colh41KEJwen9IrKzbIYpsKu7lXK6oFn4MTYuw PSBNl4aN3N3MXly9CxnkC6ucv4Dl6nkSHF1uNodwoK8QmPs4Zkd6IrbH15ECWhPizb EF6LXBqVtmk2/T1Lan+PuymZLQj7RIXQl16PpJpg= 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 4CB3C3888808 for ; Mon, 12 Jul 2021 11:57:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4CB3C3888808 Received: by mail.kernel.org (Postfix) with ESMTPSA id D370D610FA; Mon, 12 Jul 2021 11:57:02 +0000 (UTC) To: Catalin Marinas , Will Deacon Subject: [PATCH v4 3/4] elf: Remove has_interp property from arch_adjust_elf_prot() Date: Mon, 12 Jul 2021 12:52:58 +0100 Message-Id: <20210712115259.29547-4-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712115259.29547-1-broonie@kernel.org> References: <20210712115259.29547-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2201; h=from:subject; bh=0PVRAiIVFXwrk529T6zZio39WXArOzJh/GaiFzszgPk=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBg7C0ZJqtyIrQZvfLbNjD1faP5V5P6s+d30mGjMiD4 ZRslk6iJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYOwtGQAKCRAk1otyXVSH0HtbB/ 9+NTXF2e4490xsPvXtNvMV3+rjCPaIPEcHFkIpKGj1Lbb/CEu0KDzuLfsG1IkBQLQnmtM4CL2ZQE9j Q9afvJpCR3yL1XMJb9vqFKCtHexb+EZb+6nabKCrq5RMZ5tC74HhOyVSmNeAF+82jP8pQdsKsViYbB jQPXNh1yajyrFudhPG4gChZ+TbNcEOklWL1qE4XOas3QobGa+mhbxmzEDVZsHIYRgqWasDlNM3vwiq isgDntqgumD5QlvMiTN4OmnRGsRij/qUvqOfmP1EHlMV7Pmv20EqsV/55OOo6wsbYVzDNkBShfWi5Z I0W1cJYNZ8spfFYyyIUzyrN6n4C6Wt X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-11.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.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 5a6c3b198bd3..992d827b37b0 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -693,7 +693,7 @@ static inline int arm64_elf_bti_flag(bool is_interp) 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 81e151a57df2..ae8094d42480 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 12 11:52:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 44317 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 F1BB43888837 for ; Mon, 12 Jul 2021 12:00:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F1BB43888837 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626091225; bh=se/zJlYKTeZhddsmasTaHmmX84hjvUIwZs31QnKAo5o=; 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=wDW8u9lk+8fGtQkHlOi/dxjLXNdsTgXW1sj8MtiiwlBHRiApPL22h4ttJqB3cIU8m ZKWCbahiHrNj4XlRHr+mhyVQFF5qxwBtF3/CGse2x/xdlKo13hpUjIbpgwtzaJSNyt BNcHLMMD/1zao3D14Maf8/DkbXhedJs+2nTpcGao= 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 118733888035 for ; Mon, 12 Jul 2021 11:57:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 118733888035 Received: by mail.kernel.org (Postfix) with ESMTPSA id 83A5961004; Mon, 12 Jul 2021 11:57:05 +0000 (UTC) To: Catalin Marinas , Will Deacon Subject: [PATCH v4 4/4] elf: Remove has_interp property from arch_parse_elf_property() Date: Mon, 12 Jul 2021 12:52:59 +0100 Message-Id: <20210712115259.29547-5-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712115259.29547-1-broonie@kernel.org> References: <20210712115259.29547-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2096; h=from:subject; bh=HTz3krgKEK3sokcBu26fLZbDuEKvxHCHP7mYIquUumQ=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBg7C0ZI7AUHkf3F2fqzYkpePJDKctDZoneaDiuq6uX SUkWpFqJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYOwtGQAKCRAk1otyXVSH0PbNB/ 4uADYxboRbRm4twF9ZWyE6U84qFWFNhkunDdhqmV5sHMOGIfBjDRARKSkfNLBXn4lS90YL0Q8z4SAw 47BmZThdClQ1rENhXe307rAe9GLkroAP71ra86cKnkfaMmDv4o840zURvHOLuy8iJXh9wEPIq015uH lOvPm6EWiLNfXNc69ah6pIavaZxT3GWhKcRR6ifFujYxlXIVAUwiWs51Z65SVMnAS7qZ1c4JDU8d+f 4f2c3kID3uohosUWvwiHCMjNb99oD7C9Tuw/nqamCs3CsoRCW2XARenCDij2oqJ+6rDvqe78w6NTGR cs0/tW7qaFCKSzSZm8eSwE7X1DYIWm X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-11.3 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 9f86dbce2680..a6e9032b951a 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -262,7 +262,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, + 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 ae8094d42480..f0b3c24215f6 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