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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E856FC433F5 for ; Mon, 4 Apr 2022 09:44:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354652AbiDDJqe (ORCPT ); Mon, 4 Apr 2022 05:46:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354620AbiDDJqd (ORCPT ); Mon, 4 Apr 2022 05:46:33 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D3CD34B98 for ; Mon, 4 Apr 2022 02:44:37 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id B672BB80AAD for ; Mon, 4 Apr 2022 09:44:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA063C34112; Mon, 4 Apr 2022 09:44:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649065474; bh=ZQzHyj8xOGFbywMAfv75IiikXgfACmOT2q6BmmO69vI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YRNo0AywrkDdNrMZx4mD5/NDmaYttDIz9mxGINHY1sS4Hm1Z24Hdaa9g2rEG/RlBK 0PzG4IPNpT5TsJjqzwbyoia/McGNLUYqeWqD++vf/Qv1fxcFeIuOBMmeDs89jPydT6 TdkBAZje2jleuC9ak6bdCPier8a5c0c2yvXvBfs2UtIATgL/S0bhaW2UDewr1CHKNS hlgLFHb00hvcwmrPfi12DZxqppmeY21qDAOm3d2g22qb86MiFeVMQT+qGB9e70mz1a LyI+g7NPdvFv7ZcfcME9vK9TjuiDTmPx1W7JeNbqiAm+fcLOYgmM4MGJZXHQ6MgueZ Gx4CGONw38aUA== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Szabolcs Nagy , Jeremy Linton , "H . J . Lu" , Yu-cheng Yu , Kees Cook , Eric Biederman , linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, libc-alpha@sourceware.org, Mark Brown , Dave Martin Subject: [PATCH v12 1/2] elf: Allow architectures to parse properties on the main executable Date: Mon, 4 Apr 2022 10:44:24 +0100 Message-Id: <20220404094425.313821-2-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220404094425.313821-1-broonie@kernel.org> References: <20220404094425.313821-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=6534; h=from:subject; bh=ZQzHyj8xOGFbywMAfv75IiikXgfACmOT2q6BmmO69vI=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiSr33vU6ehNHbYsxlzSqHnySV8L0qzs2jtzBDlhw6 mNhP5UeJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYkq99wAKCRAk1otyXVSH0GU3B/ oDRBhOFi/tq3K4AGAkNKbi5rvdCy7kBNA0BWq+/6qRFwGWt7r1n0VI7Pfb39DznX/ojX1tJ9kO1+EW FUyqqI+WAHR8lkFZV5VTWcFYEcjsTIYw4wxSYwU6yu5w8dBoOQy7rheDGV/gv7YfuGLzRzlCLabFav IIUPKSRU6bWd6Tvq4V6cNY/99IJ35pu8wMpvGJY4ANPJew82Zj2aIZAsukxA/xHU7Hxf/Gj48cneFT yPIf3yvx8+bhLmLzkugxyeCfddYHXoTBiPyh16vREzurRd+V2fbsMdRJ6uNc/UtbaBQqMR9Ozq9SJi e2DffL9RaBi9/jNbdTqWhTHb4PnLrt X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arch@vger.kernel.org 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 a new flag is_interp flag as with arch_elf_adjust_prot() and calling it for both the main executable and any intepreter. The user of this code, arm64, is adapted to ensure that there is no functional change. Signed-off-by: Mark Brown Tested-by: Jeremy Linton Reviewed-by: Dave Martin Reviewed-by: Catalin Marinas --- arch/arm64/include/asm/elf.h | 3 ++- fs/binfmt_elf.c | 34 ++++++++++++++++++++++++---------- include/linux/elf.h | 4 +++- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 97932fbf973d..5cc002376abe 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -259,6 +259,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 */ @@ -271,7 +272,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 6556e13ed95f..ecd462bddb7e 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -717,8 +717,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; @@ -752,7 +753,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; @@ -765,6 +767,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 { @@ -814,7 +817,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); @@ -829,6 +833,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; @@ -866,12 +871,15 @@ static int load_elf_binary(struct linux_binprm *bprm) for (i = 0; i < elf_ex->e_phnum; i++, elf_ppnt++) { char *elf_interpreter; + if (interpreter && elf_property_phdata) + break; + if (elf_ppnt->p_type == PT_GNU_PROPERTY) { elf_property_phdata = elf_ppnt; continue; } - if (elf_ppnt->p_type != PT_INTERP) + if (interpreter || elf_ppnt->p_type != PT_INTERP) continue; /* @@ -920,7 +928,7 @@ static int load_elf_binary(struct linux_binprm *bprm) if (retval < 0) goto out_free_dentry; - break; + continue; out_free_interp: kfree(elf_interpreter); @@ -964,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: @@ -980,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, 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 -- 2.30.2