From patchwork Thu Sep 16 15:28:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 45091 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 EF9873857020 for ; Thu, 16 Sep 2021 15:32:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EF9873857020 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1631806350; bh=ftWdrBGceAmWudg+5Tysg60srIG5/7JASeV1X/uIgA4=; 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=CjwWGh+xmAnWspoK92+LETE3zuLBDSWupxq0a4VsmF0aAx21yL1BkAPSEEXjAtcG1 41LiszlXF4PgkbdEy+LnbnBwaWquy9SPxO7OeAioBq0C+517RpUPejOo0s2IpkotbN tte2uDwqa83c1eNKsHVnBVj6hIkI0LGIK6wjnSdM= 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 13C8E385800C for ; Thu, 16 Sep 2021 15:30:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 13C8E385800C Received: by mail.kernel.org (Postfix) with ESMTPSA id C04C16124B; Thu, 16 Sep 2021 15:30:38 +0000 (UTC) To: Catalin Marinas , Will Deacon Subject: [PATCH v6 2/4] arm64: Enable BTI for main executable as well as the interpreter Date: Thu, 16 Sep 2021 16:28:19 +0100 Message-Id: <20210916152821.1153-3-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210916152821.1153-1-broonie@kernel.org> References: <20210916152821.1153-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3271; h=from:subject; bh=rTVazhUNkG5j722LE4noH1VWtBsKLbISqMxAF9fJEBA=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBhQ2KSBTRUxUybXN12U+BV+jLcUnzYrvdhcj8e2Js9 6J5JfWmJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYUNikgAKCRAk1otyXVSH0D+cB/ 4i3WtYq4jhAqHpYm4V+ainvFPDPdmlQkW1GWtAM46gN4v+8aeDaM130ZQ9ZzaRzxJ6KOJeWixFAlqU spMMsO6/vvcrn9H7DPZClLqQ0ZCer87Duro9qcPI3n0n8UeRxNjefikub84hF1HfxEx86cOjH8K/km 24pPgcERPyB2xEnM1wBy/hFl+fGpX3hz1UTUD3u2/AyUKMaAV344+AlhnZqj8YHQGN068GM8hL8JFn jn3eqp7JZQP8MYysoucpOtxqCYWtTk8kFwI894EMeWVVmLeXe4l73NjFF39hxKndYK4ZLZiTIfHz49 QbLPgVcD1FAYHAvFVa/+0kmsH3u0B0 X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-11.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.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 5cc002376abe..c4aa60db76a4 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -251,12 +251,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, @@ -272,9 +281,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 19100fe8f7e4..1aecb20facd5 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -705,18 +705,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;