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 229FEC07E94 for ; Fri, 4 Jun 2021 11:23:19 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 DD2B1613AC for ; Fri, 4 Jun 2021 11:23:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD2B1613AC 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=bombadil.20210309; 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=uk7j8kWQ/jatgal4nwHhJf5/OwSSUgdtElfT4aKAzr8=; b=V99UEAj6jssLH2 U+ED2Advz6GOdby1b38uk8z1+Ev6xhLUNrWNsZo6iTkjqNdSQg+3t2lG5qmOGxZ4s3r7li/IG0T0u 9eXHUVCYBDww2sWS3eUYntvQEKUrGRtsrBaghRf1TsglOWHr8Y4pwfUieg5Rf9B10KiG9PRRIZhwK P8oORJ4cM8S2emuEX6pPHbUPS8LiE5uZTcV9v4nC10+8AVImwa1QcPnsFTnC65l7IJ8kIMZ7nT0pp XAMKI2c//hZTNDXQrYft4cjp4l83m/RJYj4bmaW+BFjg33qTogwwxQ4KM1rAlTylPKBkYCsc1X6lm oy4Aw8e3pBIGr9MRoPJA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lp7tE-00DG8k-SU; Fri, 04 Jun 2021 11:21:26 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lp7ri-00DFTE-69 for linux-arm-kernel@lists.infradead.org; Fri, 04 Jun 2021 11:19:52 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1E0C661369; Fri, 4 Jun 2021 11:19:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622805589; bh=UxOvTvzvIffM4aLRyIgntP4GHd3vzv87L8DyM4UTxII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P8vLqTwzrd2KfXDJNK1Kw4j0FrG7X7R1ILz84XvMUgYJS2V/EZpS9JAHFjxWTxEg4 OSwOd5+/u7xJZqAdUBDFMCLPMIfsaZ0cgTjy3IjgB9tvSCFdnA/Sh/8XTF32UfZjrA m0ABT2Cs3PcI06tB5kzkiaXg+0J2IUitlNjvSjkkJ3qhI5K9Dan3i1OnyzFdgGSPTm ZpE9jK7QDNFTIAcVvqtNjDEhsy8VAlxPKw+Z46y31kxftrl5KMxGSxqNl8gQ9JgcuN viM1RZnQ8DSZSCeLYjsumrdPDGSyoeBPV7BVwOcddCnRjKED1BrUWwm1EGYzS+xI1h 6R7YK9GYjGvhw== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Szabolcs Nagy , Jeremy Linton , Dave Martin , "H . J . Lu" , Yu-cheng Yu , linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, libc-alpha@sourceware.org, Mark Brown Subject: [PATCH v1 3/3] elf: Remove has_interp property from arch_adjust_elf_prot() Date: Fri, 4 Jun 2021 12:17:28 +0100 Message-Id: <20210604111728.12052-4-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210604111728.12052-1-broonie@kernel.org> References: <20210604111728.12052-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2180; h=from:subject; bh=UxOvTvzvIffM4aLRyIgntP4GHd3vzv87L8DyM4UTxII=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBgugvGgxS2Ievr7XanpFMsUXQrjmHCG+84nNMfLRYx Xh+d8u+JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYLoLxgAKCRAk1otyXVSH0EvGB/ 0SiN3dB15TvJjFGpyBYQOl4uvmqL4yoqy5xVxvly1OeoKESMck3T9qgBRQjj7Jl2a59iC1HY/ZUofS AHUFsO7ig4+IWBmVOPoaQ5C9+k4QTpHMTOEDp0t+KconcL4gH5Et08MGvAKu0QfUYUYfXYFNcS5EFp 33wzB5/bH7X2doVm/EkhzRjXn43Lm0PZtgly5DrD0yb/BsAWzgWnphhoTbqlkH691fC46ROH2wBKwG zDQ7HmEa3Zh7S22JUpIEIht0wEWvKGXTwMteJXNBLfvy03Ipj0ZciRere40AdDdcknzZ0hyQ4gGjU8 h0FzzQMAWnEm6vIG03qNmvx/pHTdSl 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-20210604_041950_320580_B507AC3C X-CRM114-Status: GOOD ( 12.58 ) 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 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 --- 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 f7fff4a4c99f..e51c4aa7e048 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -742,7 +742,7 @@ asmlinkage void __sched arm64_preempt_schedule_irq(void) #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) { if (state->flags & ARM64_ELF_INTERP_BTI && is_interp) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 253ca9969345..1aba4e50e651 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; } -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel