From patchwork Thu Sep 16 15:28: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: 45092 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 1E80F385702F for ; Thu, 16 Sep 2021 15:33:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E80F385702F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1631806392; bh=gHN7UqawRc0tdAOMQjPXoWMc49xChQZFnNC4aaeWNsE=; 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=ub0dyGVVEJ0Dtf/P/pRkLXqptDMcxpa/pBi1iTCRPJEoWtNrXxfg1HEug1MYEi3Hm hP2fvK54m6DHwt8CcoX4RRRmdWDmvCx60Ij+hPzUgHcOGM9r6d/9o0oq9kGRhvIdVA do4xYTKepwkISmGKG/F2JxBAbhPPVfjZImTn/eDU= 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 B2309385782A for ; Thu, 16 Sep 2021 15:30:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B2309385782A Received: by mail.kernel.org (Postfix) with ESMTPSA id 54B4D60D07; Thu, 16 Sep 2021 15:30:41 +0000 (UTC) To: Catalin Marinas , Will Deacon Subject: [PATCH v6 3/4] elf: Remove has_interp property from arch_adjust_elf_prot() Date: Thu, 16 Sep 2021 16:28:20 +0100 Message-Id: <20210916152821.1153-4-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=2253; h=from:subject; bh=0WiuvBGy0FCv218eBSBDpuWa1NLjyOxD+O0a/KAdG7E=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBhQ2KTYNVM86Sg0NXiXwfrxqYJhVUYPNrNtqnriA2v OgaW2VWJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYUNikwAKCRAk1otyXVSH0O1kB/ sGPz/TBzZF9L2fCrxBX8dxeRo/2cUGMXYXGK/paNGbiBTPcnxxpdbaQNDocCfKbI6kqA/BFzHVNBxz BYapgKar6qFTWyYqFA6vz5UO+q8W5GlAIzz+gz/sV5838w5AYkFz3muKA6VacswCIq6LTN4G8StPAC GAnf8Pci0kvnrJBjf6F3b1PjZEUlx51BUiRG5qMwc3yR/iMMQzNfqtCF8zb8yl6JEofRgnxHfT8MpC D7om/zh3IHWWduHIdnq5Tpy/0S36dctxGYPUJJsXfpCqkyiAZHJEDJiV+LykTs4vYZytdagn/CNls3 KbR+1fjCuDB6qK+aXX/inmsnP4sKB6 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" 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 1aecb20facd5..28b1742c625a 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -703,7 +703,7 @@ core_initcall(tagged_addr_init); #ifdef CONFIG_BINFMT_ELF 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 1b2d0fc87ad4..5d24aa203b61 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; }