From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by sourceware.org (Postfix) with ESMTPS id 1C4243857C42 for ; Mon, 15 Nov 2021 15:27:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1C4243857C42 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1632161501; Mon, 15 Nov 2021 15:27:31 +0000 (UTC) From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Szabolcs Nagy , Jeremy Linton , "H . J . Lu" , Yu-cheng Yu , linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, libc-alpha@sourceware.org, Mark Brown , Dave Martin Subject: [PATCH v7 4/4] elf: Remove has_interp property from arch_parse_elf_property() Date: Mon, 15 Nov 2021 15:27:14 +0000 Message-Id: <20211115152714.3205552-5-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211115152714.3205552-1-broonie@kernel.org> References: <20211115152714.3205552-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2173; h=from:subject; bh=JvHm96Bwc3ZIt2gRYk+nYHq6lARloHLCepI/y4PjMto=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBhknxOITIuBvpKgQvNCcXX3JJFXb41Z8PEQBoMT4ox iY8VsVGJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYZJ8TgAKCRAk1otyXVSH0Gm3B/ 4/MdWpEYP0I+y+FPTd3rRJ7KbMCZtGGQttx8J+Jk1uP0dI8aax5cchiMCGWjlJRA0OYsYBuWFK79zg 9Fbn9TuODLQ1AMYjr7c8EJtoCvAwUuyuv9G3I+QrGR/e5idKvFOGYrzQcRwX3LdypWNrc40XHg86fN LtTFBmD97EClEW3wJp34dYmWMrhfTQSXizL8SxciiOuN6HLb48tuJlUIsElzxMFaPqTbRAzYf9n71T ApHGKA07YhFAwBeeEV89Hvg0yFPYECFi0nGPMilEUyDgfEvGZ4EyzEkLVSyPQXf2bbJp99O0/jVGnM VvTEBvVGpKz26thsvWoI6I3PSfCDeC X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.9 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-List-Received-Date: Mon, 15 Nov 2021 15:27:36 -0000 Since all current users of arch_parse_elf_property() are able to treat the interpreter and main executable orthogonaly the has_interp argument is now redundant so remove it. Signed-off-by: Mark Brown Tested-by: Jeremy Linton Reviewed-By: Dave Martin --- arch/arm64/include/asm/elf.h | 2 +- fs/binfmt_elf.c | 2 +- include/linux/elf.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index c4aa60db76a4..8009e8f07f1e 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -268,7 +268,7 @@ static inline int arm64_elf_bti_flag(bool is_interp) static inline int arch_parse_elf_property(u32 type, const void *data, size_t datasz, bool compat, - bool has_interp, bool is_interp, + bool is_interp, struct arch_elf_state *arch) { /* No known properties for AArch32 yet */ diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 50f04e19a714..e3bfebfc2a99 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -753,7 +753,7 @@ static int parse_elf_property(const char *data, size_t *off, size_t datasz, ret = arch_parse_elf_property(pr->pr_type, data + o, pr->pr_datasz, ELF_COMPAT, - has_interp, is_interp, arch); + is_interp, arch); if (ret) return ret; diff --git a/include/linux/elf.h b/include/linux/elf.h index d8392531899d..cdb080d4b34a 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h @@ -88,14 +88,14 @@ 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, + 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, bool has_interp, bool is_interp, + bool compat, bool is_interp, struct arch_elf_state *arch); #endif -- 2.30.2