From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE28AC47076 for ; Fri, 21 May 2021 14:52:35 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7848161132 for ; Fri, 21 May 2021 14:52:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7848161132 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mbvrz3+HUqWVcwBoGGCVDRAgLHSAoeJ+jI29EHyFsLs=; b=X3HTH95sl2TN0yTv+BUCIQIHUg gRpMz9yQrqmIM4TqEujTJFEZB62zuunnLuqCvD9pmv2Ev33rsiSOju1W/a/d8ypYMG7pc+dtmXsX3 qCjbyFbG8TaI7QkQjqdjDahMURQMW37PHqnpSUxnv2wjMGys3GNNk804MZrxWXRgkNO2iRTN/sRt1 GOx6eK+Us/fdNmRd7DgSIyd7M1Vw9ELAV803iOvUlZpxuST3mM5U1GlvZwIGWtLZE6CAW5IChvWTW YQWB2sY5TATwaT3XAJaxwhVTGmeszKrOxDJQ/9S9x2LvgAJRl0ilOIiCzayzjqM5GRRwbxwrvAQZr 2gEqLTsg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lk6Uh-005q2M-NY; Fri, 21 May 2021 14:51:20 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lk6UN-005pqL-Vv for linux-arm-kernel@desiato.infradead.org; Fri, 21 May 2021 14:51:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=TRwh/nDiXzC9Ock5EgGm9qdqlG7AQnifNQOl1jsEdY0=; b=kiBT5Z89AjZ6AKaQE8qGlUx08v iGtcri5jPe+WuM7/tT9pGH201eC+Xv2ijAg3GKNhH4BS4+WAoZSLQAlEyG05wjbwFYFfLkOdpKzFu T7i51JdGkokeMUY8rxmZoOwQrlW6ipbV5HZZx+jHdC7zXIFUAGzlUFkSHmtMdaRmxNHfNiPFxrmNc XjGZVf09UPQSaJqitp9bk2kJAvUvI0SB74FQS1kT5nGpxe8iOZqQdoM1GkpaF+ILVtiV1LwkrSMr1 q0w8ze5TWQPoOSXAT6gayaYQv/RB2TaR08utboOdH+6/Rc7NfsAiWxamP48Klqe6uEYHXFtB5aMOw Zl59nR/A==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lk6UL-00HCoR-Bg for linux-arm-kernel@lists.infradead.org; Fri, 21 May 2021 14:50:58 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 85AE061244; Fri, 21 May 2021 14:50:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621608657; bh=D4NkMwVFUdPc0BTcTl67XPKgjq90SwA/PD6k/bu+LLY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vAniQIoUePrIePB+C7b0PO8AoFBHFaKWY6Cj4tBUzxHjgNDtkgLZ7t2Xm0ZcZzOkE oFYg3N7mhpTMtT3OTTUSO8H3tiaG782IJp7y2Ot9mes5CqfbkDyS63x/S2lyBNTzru CqTXxUcVU5W1bdz/kwXUZ2IRGLMk4mjzJuBfl9rsdPE18GTNo+8ZrHGO5m2B0kZ5iy fKP/NVMogLk7eHzqu3S3znbMgziz2RrInEQ3iy3MYfCxAedGOb51HznBCqOMy54UNB Y/M2fZClQKCkvg6nHoVKx/hkliauDzmmtt3zt/1tuENQGD+Vk9E1Iv06NuHvmO9lM/ HyZ8gjp2NBLyA== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Szabolcs Nagy , Jeremy Linton , Dave Martin , "H . J . Lu" , linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, libc-alpha@sourceware.org, Mark Brown 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210521_075057_457437_792FD3DA X-CRM114-Status: GOOD ( 16.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- 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; } -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel