From patchwork Mon Jun 14 22:32:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 12320141 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.2 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=ham 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 73A9EC2B9F4 for ; Mon, 14 Jun 2021 22:35:43 +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 382236124B for ; Mon, 14 Jun 2021 22:35:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 382236124B 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=UHhZKWlD2fB6BtRf+c9P25oKANgKL4MwxxAs9BdN7VI=; b=4nbQTDMf2qNVJa IaLuA6bT9OoJ6xQ96WInJcu0fzSdcq0UE7SOEcC93oJKTScGrUV8LcWxDSGIvlWlvSUUxemW2K14f P7AlVwMHVzM5OcSiwDKV83Sz9Zu4eUGRjuETFeEVEDo1YWZ8kq0Od+zzhUnG6lycTEj3Ux3ZWuga6 +Ge6nFSK5zHOu4JJqnWQNChWDJXDejeZRgvxJSOhZN+aaWLBIAPLDvn8T92XOQtYukaTSpMt933RH nDXrxBWcE6L6UxJW5vdSleem7OdvgnyjiYvRUmGTw+DHVqnVzYo31Pvx9BA0f1gcu/9N2J3lxkhJ8 EYEMbvW99FlIhgnL3X6g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsv9d-00GPun-Tv; Mon, 14 Jun 2021 22:34:02 +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 1lsv8t-00GPgl-Jz for linux-arm-kernel@lists.infradead.org; Mon, 14 Jun 2021 22:33:17 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id B398461350; Mon, 14 Jun 2021 22:33:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623709995; bh=dADxCcnOfO3ZUnZ9a2fEumgqIOKICC14vf9CSy6vgv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qGypQ71abbJTgI5upU7DehXGtS18qXrDm8e3xLXfvJCuSXYn9ycfqT3/IccI/P/iN yK/DVQBPar7K+e9A1ymKzj/WRcyQ9irrZK5K0F/fYH5UR2MVnfzBcx8vwDv+PUs+a+ Z25DdgtJnGDpnGM6d5EKYMB4pQ+dIhWn9fuTSCNBgxWgfKWHJLyMXAQVsudUqK8Rr5 82eLcyDmAkbmAfnPI/0SORZGv83zLoWXZingxp7eoyaTazvME6LRnZB3wydeSKrfDp BpvNP1Dg3WdQGKAD15DBDjz9+z4u0OK11NC4YVZmtxEuLFhYaPbRrNVDitdXtkmXxp zeS2HQ0/ytKDA== 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 v3 4/4] elf: Remove has_interp property from arch_parse_elf_property() Date: Mon, 14 Jun 2021 23:32:14 +0100 Message-Id: <20210614223214.39011-5-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210614223214.39011-1-broonie@kernel.org> References: <20210614223214.39011-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2046; h=from:subject; bh=dADxCcnOfO3ZUnZ9a2fEumgqIOKICC14vf9CSy6vgv0=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBgx9jthwgmlfRA1jM91GkX7mG7mC714J/VsA8WtqyN FwHJzzqJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYMfY7QAKCRAk1otyXVSH0Px6B/ 9ZQmIoNj/Fsbx5yBcfBfa7aW1jNFB1wAIMpAythc7L3lyflO+/Uo83KH38OzRCi72aZPXNs89O8hk/ z5KFmFFHmgUhxh++V1Uv6+JML3VbsAk4QeaW6LNwE1JlfMB6WPk4lKdlqRW1V0jo8Wl5zL2CbzsKlq skmLKgudOy6QdcUTdZ62XOROXUIDtYl9HIBqx0295UpAcHTYH7XnrUWz571gJH1RozGZPoz0/gQcRJ rQvOGo3ncDf6amtTmrO4k7JyO0rtQ5op4tXC6y6fyJ9rr8se4lVLKkDWs1rPvewsDj42iVEY86NJoT cj0wVnj4CIRpZ8Mn2W4lcJTDzZl4Nb 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-20210614_153315_729054_C9955921 X-CRM114-Status: GOOD ( 11.67 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- 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 9f86dbce2680..a6e9032b951a 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -262,7 +262,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, + 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 ffe38d54308b..5509ae63c2e1 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