From patchwork Sun Jul 23 10:04:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124444 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1190344vqg; Sun, 23 Jul 2023 03:20:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlHq3oYnrs0IfuoeVHCq4mIq4T68gRgIYVqVbYn5BTWhdNquTn96lQW7zca53zxej7c5Y9Zm X-Received: by 2002:a05:6830:1103:b0:6af:95f9:7adc with SMTP id w3-20020a056830110300b006af95f97adcmr5261244otq.14.1690107627304; Sun, 23 Jul 2023 03:20:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690107627; cv=none; d=google.com; s=arc-20160816; b=t+yOEuEoqI/XCHep2MVb4RYgW5bfVgtD4zeegg6C613P7857ahrk0q/nUqU5Y/qElk 5L3uGg+XMKM7II8Bbd5ogoxJM3c4T2WTONvmgnIhi+b+Y/PwKXZFz7z8Vl3CEIXFEZc1 kzYw4C40eP4gd2BYvL6BgCstwfL58QBK/jsR0fi40gdNuaxCTZZILM9N/lsdxYMmZfsI 0z4IiArPKTMCza/ZE9cu9EhquOkJaZ7egUg5l9AHg2htl+PhWn17a1Z2xYR23BQoZv8B o2687BiNN1M6SzN3PY3Uy9KMyI6oBS+iyj/Ncyb9Ta3pyLjhCRHe9Os5VH12hANTXmOd yp8g== 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=iqYHmfni2UvzcM+Y4K/g9xuVFXwCsz1IIULy8F6aqKY=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=XM74ij/Tly9Uxub5hrIZlmCZ4mbSce4l1B8cVVdeISBbgQIrZWjDNcJJ+vuA0CDPJ0 ZP4w531Z6F7K2ncw+xa9Erky6L+rtGGGGtMBgo1gpM2b4o6eA7SM1mDDqLVBRD2MUYa9 nqnU1J9XFfEq3OSFNPyeHf1EjdsQmyamJArhAEBLvJf2eTTwNNakMKAuU+2Wg5sPEN/3 3x/I7oKlKmqOlSVAcwobSDJvaWg2Gta2gsLMcgwZapRL1KQZEUJy5H5Fj1SyEwiW0w8E 8fbIDcdayZeU7Jk9n1utnJ4ym9xC2XvuUpZpOdSAy4dKm9K7WHrJQFkjfyK6iZMr2Kpv +R5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qPjKNyaZ; 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 o12-20020a655bcc000000b0055c881a2c18si6617914pgr.284.2023.07.23.03.20.14; Sun, 23 Jul 2023 03:20:27 -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=qPjKNyaZ; 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 S229991AbjGWKFE (ORCPT + 99 others); Sun, 23 Jul 2023 06:05:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229962AbjGWKE6 (ORCPT ); Sun, 23 Jul 2023 06:04:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E4D710FD; Sun, 23 Jul 2023 03:04:57 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E778C60C85; Sun, 23 Jul 2023 10:04:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CB3EC433C8; Sun, 23 Jul 2023 10:04:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690106696; bh=mkPBv8kLdnRfYxcYlj3UPW+Mclfkhj7WW4z0JfDd0ww=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qPjKNyaZ4XAjt58yoGipfGQpvEDbZ654wQHRPEBcP2uzoRZRnXTOhGAVAP3iCDd69 Jaatzn89i/fiA6lHNym3WV7lYlOiuQrwGKlp23qI6KaKm82qF9FljqStOLXo5LPvrL hfyuXSgfsiCnO1B/IUSll627bcEpj9pbe8AxZ9h4yVx8uz1eOaUOVeUNCTF38R1wIo JMLJGtbOaGwzWhYQmkheFlLf8dCkZ0XLRx4/KnZvKhf2oxVsXhSMpf9//JOKpuRO3T /2vlkdtsWnYoKAcEEUyJ7Sa71k3C0XvOaigLo70h7dcZ7KyJeSOdFUr/uAQVz3Br5G 3lcaCyhu9wXbQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 4/4] modpost: remove ElF_Rela variables from for-loop in section_rel(a) Date: Sun, 23 Jul 2023 19:04:46 +0900 Message-Id: <20230723100446.3062358-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230723100446.3062358-1-masahiroy@kernel.org> References: <20230723100446.3062358-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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: INBOX X-GMAIL-THRID: 1772206295552012271 X-GMAIL-MSGID: 1772206295552012271 Remove the Elf_Rela variables used in the for-loop in section_rel(). This makes the code consistent; section_rel() only uses Elf_Rel, section_rela() only uses Elf_Rela. Signed-off-by: Masahiro Yamada --- scripts/mod/modpost.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index ca04b87c1679..9761f9d0eec0 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1465,8 +1465,6 @@ static void section_rela(struct module *mod, struct elf_info *elf, Elf_Shdr *sechdr) { Elf_Rela *rela; - Elf_Rela r; - unsigned int r_sym; unsigned int fsecndx = sechdr->sh_info; const char *fromsec = sec_name(elf, fsecndx); Elf_Rela *start = (void *)elf->hdr + sechdr->sh_offset; @@ -1477,12 +1475,14 @@ static void section_rela(struct module *mod, struct elf_info *elf, return; for (rela = start; rela < stop; rela++) { - unsigned int r_type; + Elf_Addr taddr, r_offset; + unsigned int r_type, r_sym; - r.r_offset = TO_NATIVE(rela->r_offset); + r_offset = TO_NATIVE(rela->r_offset); get_rel_type_and_sym(elf, rela->r_info, &r_type, &r_sym); - r.r_addend = TO_NATIVE(rela->r_addend); + taddr = TO_NATIVE(rela->r_addend); + switch (elf->hdr->e_machine) { case EM_RISCV: if (!strcmp("__ex_table", fromsec) && @@ -1497,7 +1497,7 @@ static void section_rela(struct module *mod, struct elf_info *elf, } check_section_mismatch(mod, elf, elf->symtab_start + r_sym, - fsecndx, fromsec, r.r_offset, r.r_addend); + fsecndx, fromsec, r_offset, taddr); } } @@ -1505,8 +1505,6 @@ static void section_rel(struct module *mod, struct elf_info *elf, Elf_Shdr *sechdr) { Elf_Rel *rel; - Elf_Rela r; - unsigned int r_sym; unsigned int fsecndx = sechdr->sh_info; const char *fromsec = sec_name(elf, fsecndx); Elf_Rel *start = (void *)elf->hdr + sechdr->sh_offset; @@ -1518,15 +1516,14 @@ static void section_rel(struct module *mod, struct elf_info *elf, for (rel = start; rel < stop; rel++) { Elf_Sym *tsym; - Elf_Addr taddr = 0; + Elf_Addr taddr = 0, r_offset; + unsigned int r_type, r_sym; void *loc; - unsigned int r_type; - - r.r_offset = TO_NATIVE(rel->r_offset); + r_offset = TO_NATIVE(rel->r_offset); get_rel_type_and_sym(elf, rel->r_info, &r_type, &r_sym); - loc = sym_get_data_by_offset(elf, fsecndx, r.r_offset); + loc = sym_get_data_by_offset(elf, fsecndx, r_offset); tsym = elf->symtab_start + r_sym; switch (elf->hdr->e_machine) { @@ -1544,7 +1541,7 @@ static void section_rel(struct module *mod, struct elf_info *elf, } check_section_mismatch(mod, elf, tsym, - fsecndx, fromsec, r.r_offset, taddr); + fsecndx, fromsec, r_offset, taddr); } }