From patchwork Sat May 13 20:44:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 93604 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5981064vqo; Sat, 13 May 2023 14:40:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6KioFRkJ6xu4safIh+nH8E42Ny8LEsnXNG4CcvedPoD/ZygLkbzSoxUqCvFDhziUtDLX4X X-Received: by 2002:a17:902:db02:b0:1ac:815e:320b with SMTP id m2-20020a170902db0200b001ac815e320bmr25530719plx.17.1684014019519; Sat, 13 May 2023 14:40:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684014019; cv=none; d=google.com; s=arc-20160816; b=wCzMmSAgTxOU4S1lMh5tAMioR0pLIU7Kvzwo3xCYRKqkCKWSM3kcpbRLRZS/V57VWQ x/n1ltHmAmNoR0MGl2m8v/odGwfy18Ho9mIYAD2agf2z7Ssi0I9/Avhwfs+vToZC01rT 2YygV4+8DR80QREK4CkW8XqTpDR66zoWuIEQHeWsvLGuW3XZNviJpFIAi+b+eDkipGPF PBJuCHOcK4R3VbO35qLbiDPP5YSGeiuc4I7bBppdeATeP3/nDkhX5jX2JMFS4q1cS5U6 tzLQVjbpzkxdNHPv3keeK+jP0Igr6Z4N2/rIOB6BAOT7Fv7dJDOP0WM+WycSGHoVAJZq p3mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=uH05VTn89nMbQ58RsmJTx/rFxv21LwDAjxnuSTJ4nPo=; b=zwaX2cop7E+KTvGc/bjWxqJ+lRpoVpaGut8frEaVt9vc3fvUhxQi5fU+MKpqPtzKuW BulvBNHdOYUUas9UEq3gw15ZIDc3oD/xROgE5qn8bFRwlxk2sq5VbshYcocNrMOvCnKt sLKCqgNH7q3umWTS6aKHRJaVHyTUqc80OI0wzBfZmxzg+sUP17Sg+RZr24Ltm2Swx8AJ aj1d1dF1LJ/8bJKIv+K1E5ZcD500qXQR0LQXpss3VfaGPFDm74thU/MHgoLxhS5OJlVn zIbuVoB4zGMquL47/rJlHXQt0BtFW+NVl2zq5/fjDiGPwO9O+DjCxk8DVgGnlN/DJLD4 cMAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=R++onr6a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n16-20020a170903111000b001ae014d8d03si1584839plh.432.2023.05.13.14.40.04; Sat, 13 May 2023 14:40:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=R++onr6a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237497AbjEMUrE (ORCPT + 99 others); Sat, 13 May 2023 16:47:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234152AbjEMUq3 (ORCPT ); Sat, 13 May 2023 16:46:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EA2A40F9; Sat, 13 May 2023 13:46:02 -0700 (PDT) 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 CC4556158A; Sat, 13 May 2023 20:45:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EBF6CC433EF; Sat, 13 May 2023 20:45:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684010742; bh=SoXIycWj4KQdPY8pR5wZYEZwmM9FVSj+5ZmHcrpIoTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R++onr6agMmopZVmIWlYVYpkdqUBJqQ/SU72DJ0796Ipf7udrN2p2L+1DeMW0B1sI 0NMjV0+YiyTrpDnZ0mF+FNKBz+NQm7zP/wd431jZBTJAgx97zwXoIArljD9QInVu7e GsekDjO+szMgvF68kJawfv7Oh4dOSuBkYQcpqc77XY13EBsd02Kmc80MBli4WcoRWo v4URHtc0GiVgoDd9uECD/fO/i9IL8dKC3Bo7KyM4Kg/O00f0xq0r5QTpJeQBYBAN/N zlzeTNV8YnYGuScz7S7O2cFXX9pG49U+bQzdPXXZMdlUk/09yDu5hzC4n48pxqDro+ lfsW8mu71BTfA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Nicolas Pitre , Nicolas Schier , Masahiro Yamada Subject: [PATCH v4 14/21] modpost: remove is_shndx_special() check from section_rel(a) Date: Sun, 14 May 2023 05:44:55 +0900 Message-Id: <20230513204502.1593923-15-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230513204502.1593923-1-masahiroy@kernel.org> References: <20230513204502.1593923-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765816684497821339?= X-GMAIL-MSGID: =?utf-8?q?1765816684497821339?= This check is unneeded. Without it, sec_name() will returns the null string "", then section_mismatch() will return immediately. Anyway, special section indices do not appear quite often in these loops. Signed-off-by: Masahiro Yamada --- scripts/mod/modpost.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 43ce35377f6a..1c5dd81c0987 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1347,7 +1347,6 @@ static int addend_mips_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) static void section_rela(const char *modname, struct elf_info *elf, Elf_Shdr *sechdr) { - Elf_Sym *sym; Elf_Rela *rela; Elf_Rela r; unsigned int r_sym; @@ -1390,11 +1389,8 @@ static void section_rela(const char *modname, struct elf_info *elf, continue; break; } - sym = elf->symtab_start + r_sym; - /* Skip special sections */ - if (is_shndx_special(sym->st_shndx)) - continue; - check_section_mismatch(modname, elf, sym, + + check_section_mismatch(modname, elf, elf->symtab_start + r_sym, fsecndx, fromsec, r.r_offset, r.r_addend); } } @@ -1402,7 +1398,6 @@ static void section_rela(const char *modname, struct elf_info *elf, static void section_rel(const char *modname, struct elf_info *elf, Elf_Shdr *sechdr) { - Elf_Sym *sym; Elf_Rel *rel; Elf_Rela r; unsigned int r_sym; @@ -1449,11 +1444,8 @@ static void section_rel(const char *modname, struct elf_info *elf, default: fatal("Please add code to calculate addend for this architecture\n"); } - sym = elf->symtab_start + r_sym; - /* Skip special sections */ - if (is_shndx_special(sym->st_shndx)) - continue; - check_section_mismatch(modname, elf, sym, + + check_section_mismatch(modname, elf, elf->symtab_start + r_sym, fsecndx, fromsec, r.r_offset, r.r_addend); } }