From patchwork Tue Jun 20 12:05:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 110452 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3621411vqr; Tue, 20 Jun 2023 05:20:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6cgU7XevEpUH5x6lykYF92GYnv8uBCpLGlDMF675U4shNOe6Weji6cEWKGqMYGSZzVKmol X-Received: by 2002:a05:6a21:329e:b0:11d:24c1:c599 with SMTP id yt30-20020a056a21329e00b0011d24c1c599mr12851288pzb.5.1687263606322; Tue, 20 Jun 2023 05:20:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687263606; cv=none; d=google.com; s=arc-20160816; b=p/+ajskaEMYnX16evBOp7OacggevDQJI3qcVeX7MxaWadd23yAMcOAZ4Ww7FHkcO3y 0IwSri0/yHju34CHO55DtNbTH+Xp0iPf5uJEc0yNPRjOhuFFsoNnvrLN51/OHs3kB/Zk 6TXbk2+9/hZOiiJsebu4aQvCWHFeT3yEzsAPuFrPnnB9bSVVJqa2K0wbMasz4JbNzEuH kZFfPh4WXMWTme4kBV9T7aPNTasEp2psYTBY1Vu+cB8YMDiirVI42KpWndtBksTCl/12 C8DcCZVeIrg7uq0GhG1/lOnEDVMDL2dCUMPQ7fOK5r9y28BN5XiCPeMR/Fc6MFwu5Bp9 pSFQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=j6RF82dUnPLYe1XOFJJVvMTnK1ThVPlIi2VmMihmVig=; b=PuXz6/u3n7EYD8lZuaBNfltFs7tpBzjMGj0tBghzYnk2z9U7XCoLeTsLkRV2l/a7XN s2EiINwz0EHCZ5J3juv+AIrRxOFPUlzY0RRZUh6khubCq3iu92RwunKEzzUmiqPC3KZR M9GxlFj9vKmx6xPhfV2yJiGt9vn9C3A3IGaVnqrFOO4kAEGZWF7SP7SNiyKe/LV8h3F3 eq8dtWrSw+MdHp14dvEI8j4COqQUPqDOCUONKKgvXsP4VAzYjjgMQyJDMOpLTLjTv4oD EvUqhaZh2WQe/sijjSY9R2Swm5o5Bmd8GzQTwBujDF+z6QaKgDPWav5snBMaK0brwFl4 68pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BdJBhZ2p; 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 l73-20020a633e4c000000b005538c82b70esi641514pga.101.2023.06.20.05.19.51; Tue, 20 Jun 2023 05:20:06 -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=BdJBhZ2p; 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 S232519AbjFTMFi (ORCPT + 99 others); Tue, 20 Jun 2023 08:05:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232574AbjFTMF3 (ORCPT ); Tue, 20 Jun 2023 08:05:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39DFE170C; Tue, 20 Jun 2023 05:05:28 -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 C1F1C611EA; Tue, 20 Jun 2023 12:05:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C678FC433C8; Tue, 20 Jun 2023 12:05:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687262727; bh=fo/HY+4/U2YoL8+5myRX8J+xt11fEMJWxO7l4IEHPH8=; h=From:To:Cc:Subject:Date:From; b=BdJBhZ2pi6yfDXYGE1RXqL+cmvlCGxYZJ3/FD0mqpEWoHOfavsABlo5ii6L5HoPvl GeQsxNRHs3NimIw8hB438iHjwAHWncN5XGRiyYI0iourWuzGJEGmlwXSskFvi4ncGe +Q6fqMMSS5Bc/DgF/2wElaJuuBTg5WUfyt2kUp6LRKFXGT/ruYPee1WJ0JWdzY6xh9 kWzscZNA0+18nP8SJedpsX83oTz+CRHvV1V9Iha53KJSKjMQAudIZTNEIN+VlQejgB 7e1MDtVirm4VgCZJNHTkVkb7noEd794QJ+GcEe2P78q8TsQWtB/BmJFRHSahjTQ6kz B4gaoRVlkLHqQ== 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 1/3] modpost: factor out inst location calculation to section_rel() Date: Tue, 20 Jun 2023 21:05:19 +0900 Message-Id: <20230620120521.688124-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 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?1769224123352929753?= X-GMAIL-MSGID: =?utf-8?q?1769224123352929753?= All the addend_*_rel() functions calculate the instruction location in the same way. Factor out the similar code to the caller. Squash reloc_location() too. Signed-off-by: Masahiro Yamada --- scripts/mod/modpost.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 6e0b8be32648..2551ac9d5bd3 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1256,16 +1256,9 @@ static void check_section_mismatch(struct module *mod, struct elf_info *elf, tosec, taddr); } -static unsigned int *reloc_location(struct elf_info *elf, - Elf_Shdr *sechdr, Elf_Rela *r) -{ - return sym_get_data_by_offset(elf, sechdr->sh_info, r->r_offset); -} - -static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) +static int addend_386_rel(uint32_t *location, Elf_Rela *r) { unsigned int r_typ = ELF_R_TYPE(r->r_info); - unsigned int *location = reloc_location(elf, sechdr, r); switch (r_typ) { case R_386_32: @@ -1302,11 +1295,10 @@ static int32_t sign_extend32(int32_t value, int index) return (int32_t)(value << shift) >> shift; } -static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) +static int addend_arm_rel(void *loc, struct elf_info *elf, Elf_Rela *r) { unsigned int r_typ = ELF_R_TYPE(r->r_info); Elf_Sym *sym = elf->symtab_start + ELF_R_SYM(r->r_info); - void *loc = reloc_location(elf, sechdr, r); uint32_t inst, upper, lower, sign, j1, j2; int32_t offset; @@ -1396,11 +1388,10 @@ static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) return 0; } -static int addend_mips_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) +static int addend_mips_rel(uint32_t *location, Elf_Rela *r) { unsigned int r_typ = ELF_R_TYPE(r->r_info); - unsigned int *location = reloc_location(elf, sechdr, r); - unsigned int inst; + uint32_t inst; if (r_typ == R_MIPS_HI16) return 1; /* skip this */ @@ -1502,6 +1493,8 @@ static void section_rel(struct module *mod, struct elf_info *elf, return; for (rel = start; rel < stop; rel++) { + void *loc; + r.r_offset = TO_NATIVE(rel->r_offset); #if KERNEL_ELFCLASS == ELFCLASS64 if (elf->hdr->e_machine == EM_MIPS) { @@ -1519,17 +1512,20 @@ static void section_rel(struct module *mod, struct elf_info *elf, r_sym = ELF_R_SYM(r.r_info); #endif r.r_addend = 0; + + loc = sym_get_data_by_offset(elf, fsecndx, r.r_offset); + switch (elf->hdr->e_machine) { case EM_386: - if (addend_386_rel(elf, sechdr, &r)) + if (addend_386_rel(loc, &r)) continue; break; case EM_ARM: - if (addend_arm_rel(elf, sechdr, &r)) + if (addend_arm_rel(loc, elf, &r)) continue; break; case EM_MIPS: - if (addend_mips_rel(elf, sechdr, &r)) + if (addend_mips_rel(loc, &r)) continue; break; default: From patchwork Tue Jun 20 12:05:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 110453 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3621447vqr; Tue, 20 Jun 2023 05:20:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4zSApEicga/ePuuH0sg0Z7Ths16sMZB0t2ge7OZEARP6fmkSiJyFip89OmW1RZb67IGNg8 X-Received: by 2002:a05:6a20:e618:b0:122:f04a:3002 with SMTP id my24-20020a056a20e61800b00122f04a3002mr67933pzb.14.1687263609936; Tue, 20 Jun 2023 05:20:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687263609; cv=none; d=google.com; s=arc-20160816; b=W2FVN2tCe0vHPKjLJz6bATaTofcFvnTn3VQNycl/pObaVx3xiCe2nnQdquOzbwJiWz C88IaqdUGVD/qQEr9c6no+dfe0OE1Ap5mrIHOJ2KLkFES2Q49DkTT3monHinpCoIG9XZ RVSDDYBJ/G66Wzinl4gj0+EcH5aOwEtdAMZEvxXOktPzqAyMO8MAET7kA3ZMzn1dX1qE UHkrWtKq+K1K3Jj31yY7EzQhGGjmIv0/+jc9F6tH/Vx6b/Y5NhpKAc+jcoTV3IGxeg07 iAy3uxnVX1uMRSJD/3XsrSyRB/X1MzElnkExn0un0D7FGEpbLBnFBJvKJj/5IoejzWuz CaZA== 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=p++hghqg9V7UsTbGfGu6j64cdEMjKzvFEbWTgsgTaGc=; b=X/ZjOYo2uYjHvKHe3di4HfS5QgYcNc4jSIlKX4xTj1MdqpY1DDX/wIyggtp6J0G/mA lvLuLj+CqTINEqqbH+EfaOXh0Rvl6Ku39PUWtGFTxR62jbk9RDFTt+lyKOcKaV3XlGwg NlevuK74ulMIAb9UmK5T4pxM9KZFin5nH6Gli1KuUQdrIBXR5sDqPzpr1DFcREplhG01 AQf1Ys11HCVoQHlfGxttRq1/g0XD7tzPRmKEEjq8vMxOKkxdrUzIXl1zlbuzkubsBs4s RPF3rAmqrEQfVRzmqjeGJ/wu8iFgIvhe6Jav5dwXuAmrtKfpZyct+5TczKyughhGbxIf sFNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AgueyVrt; 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 s11-20020a170903200b00b001b1cdef2654si1617078pla.645.2023.06.20.05.19.54; Tue, 20 Jun 2023 05:20:09 -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=AgueyVrt; 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 S232547AbjFTMFq (ORCPT + 99 others); Tue, 20 Jun 2023 08:05:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232618AbjFTMFb (ORCPT ); Tue, 20 Jun 2023 08:05:31 -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 C951010F3; Tue, 20 Jun 2023 05:05:29 -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 5B9D5611FB; Tue, 20 Jun 2023 12:05:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C0CEC433CA; Tue, 20 Jun 2023 12:05:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687262728; bh=2ReNXn5QKyfmsIaf+RPx+AKwwDkxRAR+rcyRaaWC81Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AgueyVrtoivd4awbdEnSIoa4Jbw+JcNKE+wbISLopEeSRnV96cql5isRbTSgBJbzQ 25YKqrFH+ofdk+3xOhIXEWAr1sIpkrC6NXYhiT8O7G4awRamuhivH9umAUmhN7Jdfm sA/VauSD3Pn097KlGDesTcvIrqZNn81ZiOKfnmXHl71sqO1v3xPoC6To8wMZvrrQvP Ovv/8b7THfmlLF1Q+RX2oU/mlDJVxWUt/ZPOG5b6FczqIPF+6m29sOE0Hs79Ml1+RR MUkP7sZDDZGyF3Ymm6oZsJbV79gaNaP0vkv2I/1rR2ZqI9CFSzfiixmpHSmdl2x6ft aHDygN0MS8ueQ== 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 2/3] modpost: factor out Elf_Sym pointer calculation to section_rel() Date: Tue, 20 Jun 2023 21:05:20 +0900 Message-Id: <20230620120521.688124-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230620120521.688124-1-masahiroy@kernel.org> References: <20230620120521.688124-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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769224127462141060?= X-GMAIL-MSGID: =?utf-8?q?1769224127462141060?= Pass the Elf_Sym pointer to addend_arm_rel() as well as to check_section_mismatch(). Signed-off-by: Masahiro Yamada Reviewed-by: Nick Desaulniers --- scripts/mod/modpost.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 2551ac9d5bd3..ffe45c54f024 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1295,10 +1295,9 @@ static int32_t sign_extend32(int32_t value, int index) return (int32_t)(value << shift) >> shift; } -static int addend_arm_rel(void *loc, struct elf_info *elf, Elf_Rela *r) +static int addend_arm_rel(void *loc, Elf_Sym *sym, Elf_Rela *r) { unsigned int r_typ = ELF_R_TYPE(r->r_info); - Elf_Sym *sym = elf->symtab_start + ELF_R_SYM(r->r_info); uint32_t inst, upper, lower, sign, j1, j2; int32_t offset; @@ -1493,6 +1492,7 @@ static void section_rel(struct module *mod, struct elf_info *elf, return; for (rel = start; rel < stop; rel++) { + Elf_Sym *tsym; void *loc; r.r_offset = TO_NATIVE(rel->r_offset); @@ -1514,6 +1514,7 @@ static void section_rel(struct module *mod, struct elf_info *elf, r.r_addend = 0; loc = sym_get_data_by_offset(elf, fsecndx, r.r_offset); + tsym = elf->symtab_start + ELF_R_SYM(r.r_info); switch (elf->hdr->e_machine) { case EM_386: @@ -1521,7 +1522,7 @@ static void section_rel(struct module *mod, struct elf_info *elf, continue; break; case EM_ARM: - if (addend_arm_rel(loc, elf, &r)) + if (addend_arm_rel(loc, tsym, &r)) continue; break; case EM_MIPS: @@ -1532,7 +1533,7 @@ static void section_rel(struct module *mod, struct elf_info *elf, fatal("Please add code to calculate addend for this architecture\n"); } - check_section_mismatch(mod, elf, elf->symtab_start + r_sym, + check_section_mismatch(mod, elf, tsym, fsecndx, fromsec, r.r_offset, r.r_addend); } } From patchwork Tue Jun 20 12:05:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 110454 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3625188vqr; Tue, 20 Jun 2023 05:26:43 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ40Y7C8IfpYpivlI0RIhEzOAjLpm+k10xAdn32VGDFgn5aFGG2DljybXCm44EB5cYshAMSp X-Received: by 2002:aa7:88cf:0:b0:666:ac6f:e8fd with SMTP id k15-20020aa788cf000000b00666ac6fe8fdmr9361221pff.1.1687264002949; Tue, 20 Jun 2023 05:26:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687264002; cv=none; d=google.com; s=arc-20160816; b=mfgzkGdmhcOugNdW/8kygF8kA+b6blEg7A+ZIy2tmiOrCkC8GsbupMFjTTjt+CYc2d 5yaCFkq002K+u8XH0Q8zqMER9LyD0kyolNDiAQqR53XfT60dEivq9aIqFhVVQs61U7l8 tsQ2g6bcfHgP87SKxW5poeHDvNr4VptirTokGqZo1F8bhQpftANy7lEJ5I9eeIQ4I0L5 yFotmV3yGSZhEwLXtjm6898j9hVT12aWRpBGL1IohTAFFv3UJxJa81f60DWUJdIPUIzY w0TeQ757Y/FFvEYsc6MGxY2BOUDkO0X0xQuIy8Kde6oKjjAvkwjTngeQ9w3NJUOZmTgV IQ2w== 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=m6ZLSBOAXfY3njDtgHZ3wgEwnz7vGwVc5qV+q3UoOqg=; b=lSr2yLRUutg4eqxqtQ6EQ72n2lAgx2bToUZHOfhgM6PpajgvkO+sffQkQtyvGo2Zkm UZiW6wBybQTCcrdjecjcynNa6LH2WqlM3FEtuMm9lxJ06lWCCxk4xjff+JAcu8jPL6Ss Ae/mWvaoBoMX1e+/El++ZYbV2sMWHZPXBzvVOV47x29A3WoFYLrdBKT2ISGt9ZO498wH KYfHkLHQLDuyYRSgJRL7ycx1Zxb9j9qBL7NCcCMwPf/aR22xD+1Z40Gj7D71v0EtxfXw PiPFMx6g0xdkHEu9ZpB6BxmKD+vxeZR4cNm/GAYvtEDxDtxaIs3MuLOP51cO+mSYED86 Jaww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=m9Y5Pp5t; 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 k4-20020aa79984000000b00660b5630927si1590975pfh.133.2023.06.20.05.26.30; Tue, 20 Jun 2023 05:26:42 -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=m9Y5Pp5t; 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 S232490AbjFTMFs (ORCPT + 99 others); Tue, 20 Jun 2023 08:05:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232642AbjFTMFc (ORCPT ); Tue, 20 Jun 2023 08:05:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A46BBE7; Tue, 20 Jun 2023 05:05:31 -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 41354611FD; Tue, 20 Jun 2023 12:05:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43F70C433CB; Tue, 20 Jun 2023 12:05:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687262730; bh=ZLfc+BSXjZJWCTWdJRPUCYMoN06HfdLCglJJPJ8L31Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m9Y5Pp5twFPMxnncPtk/qaRl6y59jcV46j961RurHjbJBOLkh7Z/blHDOcPHOSSS/ ozQxCkpfI8e+MEn/iGB0qYzfKHLEIDNirR5Qh9tuCEha3ijLYRpzT+LykDOdirkCbV 0dCnCdRgxYx3dRq9PsjnxO4O4nOUVLC1yjAQsZ0pUvoAQysIE9AJx+VNl1sAcx7XWq lTgjpwGhTvAJUMQEyZX25gja5520ZEWYUSZOfLayal1b1WzJlA0CuRE/ePF3/gxzKL dXi2TdV9+bCRiCmvaw6CeVm1vDSGuI95AKpSJCdYBFerD7yoFh+axB7R7JNZqga2TU /l9bxglQFZqZw== 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 3/3] modpost: continue even with unknown relocation type Date: Tue, 20 Jun 2023 21:05:21 +0900 Message-Id: <20230620120521.688124-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230620120521.688124-1-masahiroy@kernel.org> References: <20230620120521.688124-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?1769224539085404850?= X-GMAIL-MSGID: =?utf-8?q?1769224539085404850?= Currently, unknown relocation types are just skipped. The value of r_addend is only needed to get the symbol name in case is_valid_name(elf, sym) returns false. Even if we do not know how to calculate r_addend, we should continue. At worst, we will get "(unknown)" as the symbol name, but it is better than failing to detect section mismatches. Signed-off-by: Masahiro Yamada --- scripts/mod/modpost.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index ffe45c54f024..7e92380d4f1f 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1267,6 +1267,8 @@ static int addend_386_rel(uint32_t *location, Elf_Rela *r) case R_386_PC32: r->r_addend = TO_NATIVE(*location) + 4; break; + default: + r->r_addend = (Elf_Addr)(-1); } return 0; } @@ -1382,7 +1384,7 @@ static int addend_arm_rel(void *loc, Elf_Sym *sym, Elf_Rela *r) r->r_addend = offset + sym->st_value + 4; break; default: - return 1; + r->r_addend = (Elf_Addr)(-1); } return 0; } @@ -1392,8 +1394,6 @@ static int addend_mips_rel(uint32_t *location, Elf_Rela *r) unsigned int r_typ = ELF_R_TYPE(r->r_info); uint32_t inst; - if (r_typ == R_MIPS_HI16) - return 1; /* skip this */ inst = TO_NATIVE(*location); switch (r_typ) { case R_MIPS_LO16: @@ -1405,6 +1405,8 @@ static int addend_mips_rel(uint32_t *location, Elf_Rela *r) case R_MIPS_32: r->r_addend = inst; break; + default: + r->r_addend = (Elf_Addr)(-1); } return 0; } @@ -1514,20 +1516,17 @@ static void section_rel(struct module *mod, struct elf_info *elf, r.r_addend = 0; loc = sym_get_data_by_offset(elf, fsecndx, r.r_offset); - tsym = elf->symtab_start + ELF_R_SYM(r.r_info); + tsym = elf->symtab_start + r_sym; switch (elf->hdr->e_machine) { case EM_386: - if (addend_386_rel(loc, &r)) - continue; + addend_386_rel(loc, &r); break; case EM_ARM: - if (addend_arm_rel(loc, tsym, &r)) - continue; + addend_arm_rel(loc, tsym, &r); break; case EM_MIPS: - if (addend_mips_rel(loc, &r)) - continue; + addend_mips_rel(loc, &r); break; default: fatal("Please add code to calculate addend for this architecture\n");