From patchwork Fri May 21 14:46:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 43533 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 D7D35398E442; Fri, 21 May 2021 14:50:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D7D35398E442 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1621608655; bh=awyWKLzbDGPXniSjq+ssBBhF6lI/wUIs0OVGQTOF9Xo=; 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=LdHBFISgGVr3VPYwYWdoGNepXvSdt3tCdkRehon6C2fRSd8m3bhi78UHmHbgHUUmb ApGSezTXG2Qel/ZRUhwJPvsttiaUjOWLZ/9j1II4nqBEHRPs0BJdRkpGkj9LKnz9/c x9X6ZJvPdHlY/dHWQpcqmtU8z3p10VBvH038IMWE= 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 42F44398E444 for ; Fri, 21 May 2021 14:50:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 42F44398E444 Received: by mail.kernel.org (Postfix) with ESMTPSA id E181F61244; Fri, 21 May 2021 14:50:51 +0000 (UTC) To: Catalin Marinas , Will Deacon Subject: [PATCH v1 1/2] elf: Allow architectures to parse properties on the main executable Date: Fri, 21 May 2021 15:46:20 +0100 Message-Id: <20210521144621.9306-2-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210521144621.9306-1-broonie@kernel.org> References: <20210521144621.9306-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=5445; h=from:subject; bh=G5fA81JEIyxf+M2K0se19yfxqapszMVGJu5iBjN/rtQ=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBgp8e6e0g4Ba7kOqu+BRX+NDPWX+ROI7NqnVTvDQiL Z7h39pCJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYKfHugAKCRAk1otyXVSH0MoJB/ 9aHsVEDosHoGnVeqTvlQrQd58T1bPPHq6AEfIf8fE5E/t8hmDhu+uStuIW4F7sljABj+6VrE05I1r9 ohBUcW/G9MxVTySzTEuYek6MBcM3NI3uRsJUN647V0LJlWgEzGqcNvLNluEPUBpgGQQg6TtpeMr62V RtDEIbFrZd4h/liK9xTmvJf6JxiewgW5S4WNMbejq05gPcEmc1NLJzpPQoga4dcrzVume29RgyWM0T +c9mvIi+yrZZx09RWMwBIyN9RlDita5gq1H8gbTb6ZjWYbfKRQkXFZVu+hYAw92bWZ29XMQygMQqdG x6QB9f9AWLg5dtGUgzSzQIovAq98Bn X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-10.0 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, libc-alpha@sourceware.org, Szabolcs Nagy , Jeremy Linton , Mark Brown , Dave Martin , linux-arm-kernel@lists.infradead.org Errors-To: libc-alpha-bounces@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 | 25 +++++++++++++++++-------- include/linux/elf.h | 4 +++- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 8d1c8dcb87fd..c8678a8c36d5 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 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() && 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..c8397664af39 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -716,7 +716,7 @@ 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, + struct arch_elf_state *arch, bool is_interp, bool have_prev_type, u32 *prev_type) { size_t o, step; @@ -751,7 +751,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, is_interp, + arch); if (ret) return ret; @@ -764,7 +765,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, - struct arch_elf_state *arch) + bool is_interp, struct arch_elf_state *arch) { union { struct elf_note nhdr; @@ -813,7 +814,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); + is_interp, have_prev_type, + &prev_type); have_prev_type = true; } while (!ret); @@ -828,6 +830,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 +966,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 +981,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, &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, + false, &arch_state); if (retval) goto out_free_dentry; diff --git a/include/linux/elf.h b/include/linux/elf.h index c9a46c4e183b..a20dcdcd86c5 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 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 is_interp, + struct arch_elf_state *arch); #endif #ifdef CONFIG_ARCH_HAVE_ELF_PROT From patchwork Fri May 21 14:46:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 43534 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 F1282385783A; Fri, 21 May 2021 14:51:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F1282385783A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1621608661; bh=TRwh/nDiXzC9Ock5EgGm9qdqlG7AQnifNQOl1jsEdY0=; 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=q+5duK9HZjUBGH8p3SaPRl6hlXW8PqSIE4ZYjCv06qIwworO3cbtWHX6H56ubbLVE To7N8fR/h2fq9gbXvhzj0R48OS/xXGT1R2W6iq598swteiAVVR1uCYuFD8TJurZtJZ h/axFGm4wcVg4qHyftNuGcaY3zURiRq0CtgjMmpI= 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 E55BF398E444 for ; Fri, 21 May 2021 14:50:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E55BF398E444 Received: by mail.kernel.org (Postfix) with ESMTPSA id 85AE061244; Fri, 21 May 2021 14:50:56 +0000 (UTC) To: Catalin Marinas , Will Deacon Subject: [PATCH v1 2/2] arm64: Enable BTI for main executable as well as the interpreter Date: Fri, 21 May 2021 15:46:21 +0100 Message-Id: <20210521144621.9306-3-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210521144621.9306-1-broonie@kernel.org> References: <20210521144621.9306-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3120; h=from:subject; bh=D4NkMwVFUdPc0BTcTl67XPKgjq90SwA/PD6k/bu+LLY=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBgp8e63Q/Dzu8hcmWFYniSEJxbsvuwGRE0+k9cyO0P 0XKO4s2JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYKfHugAKCRAk1otyXVSH0DRBCA CBxIRQ9ElIqsXh6FhTohh75nkTNeSv/jJXMBdCw+Efs/pK/mLYCt9hCEBJAJnsag5dWtMIgbe9TlFv 8y61VecnnoI4jC0yZdj1eyE35cNSMgfCgwSDyZzJ+gGVQ17VkfQ+eHOvnpFPW8Fx2xzfNQiOxEB+Y/ lOVXeRDWno6UtdGseT2IUGfkqR9lkmhwsRwJhlqhVYvcnEnlTArSbuWpLDhJa+XpGfFzEHD99CK/Fe G3FgV8m5QcwY2EDC9oz119hNQmjIb81+ntPbSP4xjaWvQlFvyVARycZejH2j2ewvJQ/Ka/XYd/b5cH OyUD+hwg7ILJqA7HSGboMbgV/M8VR0 X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-10.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.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, libc-alpha@sourceware.org, Szabolcs Nagy , Jeremy Linton , Mark Brown , Dave Martin , linux-arm-kernel@lists.infradead.org Errors-To: libc-alpha-bounces@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 c8678a8c36d5..a6e9032b951a 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() && 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; }