From patchwork Mon Jan 24 15:07:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 50405 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 B2181385801D for ; Mon, 24 Jan 2022 15:10:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B2181385801D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1643037013; bh=vfs/te766AoqPzZ0L2zmLrltgM+9c4JZbZI+w27lrso=; 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=bffI29UwlmoyvP9RtQIs+rtqaJi6LhlEdUAqs64QnZMYSxWDrzL2fXbkpvyZzBwSi FR70+vM4A4PmeaKnwIslFWK9Rw/mbW7Aysip58TR4oEytH2JCOrd4ok7TspJm3wV4W xdUrYTfHRcAF+rc372uv8KjM9qY/rr7jXxNuX15E= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by sourceware.org (Postfix) with ESMTPS id A16C13858015 for ; Mon, 24 Jan 2022 15:07:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A16C13858015 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 dfw.source.kernel.org (Postfix) with ESMTPS id 394736145C; Mon, 24 Jan 2022 15:07:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD940C340EC; Mon, 24 Jan 2022 15:07:53 +0000 (UTC) To: Catalin Marinas , Will Deacon Subject: [PATCH v8 4/4] elf: Remove has_interp property from arch_parse_elf_property() Date: Mon, 24 Jan 2022 15:07:04 +0000 Message-Id: <20220124150704.2559523-5-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124150704.2559523-1-broonie@kernel.org> References: <20220124150704.2559523-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2173; h=from:subject; bh=AgvHJ05mKlanHTKPxlvF3HP9xWj1bFujzXnIQtNs0qQ=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBh7sCV5pbroCzNdrQI6WswDIxBtw80BpnySXQ1Hojz LOHZoKGJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYe7AlQAKCRAk1otyXVSH0O0vB/ 9KE5CJ10Jv+de4lujwv4rzrdy9amy41Qfx8+qwkEdVL9RKrSl/lcHJMf1bWD2ooFU4UguhiR/NK3Dy dDvb5tPAjR+pfY4mV+ChjNX33tpGLDOX4/uMkZcen4ZisJLbdcDOKRFELofpmd43nWNvrQTc3gu6mW P3todCZycJiwdtQS1KvRXviiR4YCLgMtyaljjjG1wKRoXlykvd3//rvdHuDoBhWgF9stBaaeW/yHnf 97oMXIc6EYAFTMbkvtpIauGQTwV2YHe7Kgtcl/Ve7icYEoqv44lLSP2K0SWOZ4HVzZ8AP5L/wG666b ja8EwxE9GcmgqnTQXv5G3ogbtCrLjB X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-11.7 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 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 Reviewed-by: Catalin Marinas --- 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 c1620358ab77..caedfdcead61 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