From patchwork Wed Nov 1 15:04:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 160572 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:abcd:0:b0:403:3b70:6f57 with SMTP id f13csp487288vqx; Wed, 1 Nov 2023 08:07:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGtoek8fk4HFXcJee/ok7IoAQEW4sJ3axQ6OurAkSUyaVmQBVwf+01AIeAMiZiSOUd613Y0 X-Received: by 2002:a05:6e02:2182:b0:351:5b43:5ecd with SMTP id j2-20020a056e02218200b003515b435ecdmr21713439ila.14.1698851220069; Wed, 01 Nov 2023 08:07:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698851220; cv=none; d=google.com; s=arc-20160816; b=x+LKI3RtVIbx5NJgeaLXyow9eSk74z1C3pD31spWpHr0c/mdnpq1UjisSvodZlpfTT MZrnpKx6tpG1tSmJbTwHnAZybO03uQvUvoQzwyHGAblcfqkjPEuDEstomzEW7chyLpcH C+UoREvCaNzdhH+ey6OdphTyFXdCUwnQccuE9B0/MdEFNpWZ7FGJg62EGr9+b8kxXvUD 01ptyN7Qv1VII2xGLomE8lk2a/rNnPbOSCw6CjeqquVFZ2Z1czHiupds5FAo/pcLBMac 58ka2U8XJWT/7aNu8k8c995Fmu1+tggTymgBRbvrFsKTBgpl2CdttiZ1R0C0GmoSPZ1y W9Pw== 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=d+iUhlGeSIt7W31N5k72KK1/eWY6WYq/54fp2jRtnBU=; fh=dBMhXJFA9J4pDfXGrZbkhy+Gp1pVbk3H3l2Zx64V9wM=; b=M06g5cItc59epG+w/9lScs2mC5YCQN/EuwMyxeHZP0XcJRLExknGMooMbWZhZPk+rB igPT4Z1xeCtkPC9Yd+83G3JWqjka3BRBgQw55H7DMTHBN4xIMOoBENO5EXsjvIRfHKbD 9LSPptiHnrMzN/lpxrlLueU8m01y18d2Q3lLuH2Mq08C2sQT/Pa7HT5mvXyJIIwPdW3j CjkB6VG5PXFp74SjJ0kF/88oAcTbzqD/flgDYlYptTzMXpnCiSI9CdiWjxwethFQw888 x/0pJc7A92xXNGSDs5IGDx7qDSyqDeRH7ZFTgtIOYNTBh9ta3TKjaMji/ZYk5nedLjsZ xd0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uE+WrCb7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id y11-20020a656c0b000000b005641315d956si94062pgu.147.2023.11.01.08.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Nov 2023 08:07:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uE+WrCb7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 87ABF80ACC51; Wed, 1 Nov 2023 08:05:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232860AbjKAPFU (ORCPT + 35 others); Wed, 1 Nov 2023 11:05:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232591AbjKAPFO (ORCPT ); Wed, 1 Nov 2023 11:05:14 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC2E9138; Wed, 1 Nov 2023 08:05:04 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20955C433CC; Wed, 1 Nov 2023 15:05:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698851104; bh=G5IEU13BAIg0z0NXW6uKOCp7ssGljo/FCvyBke8OHsQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uE+WrCb7M6EmKJdxJmKMrN/sRX3Hp6ydLqFVsn6B3tVKj8NG2/4jzEs8XIw6a0fn1 Sp4SujkKHUgM1mUPTI1vhmZXJie9QgjC5tsgQTfXGtoRnPoYLKfY0EAwkEN6wm9JhJ 8N9Ynm2p232u7jxkHH2RclCoFG9YeI5YsPWyvR6CaeSbCgzuM7Nc0iL3PRUYk3XlRf ruf8hY+VoJRLNBPpnEbP90M9csUCKeNRsODr4zHU/3xDNcw8icqhRK9rXOYyGVDbwo MPzL1vCOvE+IQ/x0tzgJO84VwgjEbssQ2IwyFcdPMm727TADppazOgsb1Nc16MPV4b TknK6oyhPTzUA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Greg Ungerer , Jack Brennen , Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 7/7] modpost: look up the correct symbol in check_export_symbol() Date: Thu, 2 Nov 2023 00:04:04 +0900 Message-Id: <20231101150404.754108-8-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231101150404.754108-1-masahiroy@kernel.org> References: <20231101150404.754108-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.6 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 01 Nov 2023 08:05:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781374617020790319 X-GMAIL-MSGID: 1781374617020790319 Greg Ungerer reported modpost produced false-positive "local symbol '...' was exported" errors when m68k-uclinux-gcc is used. I had assumed ELF_R_SYM(Elf_Rela::r_info) pointed to the exported symbol itself if it is in the global scope. This assumption worked for many toolchains, but as it turned out, it was not true for m68k-uclinux-gcc, at least. If the 'sym' argument passed to check_export_symbol() is not the exported symbol, look up the correct one in the symbol table. It incurs a search cost, but since we know its section index and address, we can exploit the binary search. Reported-by: Greg Ungerer Closes: https://lore.kernel.org/all/1fac9d12-2ec2-4ccb-bb81-34f3fc34789e@westnet.com.au/ Signed-off-by: Masahiro Yamada --- scripts/mod/modpost.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 896ecfa8483f..ee67bc6d71ee 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1021,6 +1021,18 @@ static Elf_Sym *find_tosym(struct elf_info *elf, Elf_Addr addr, Elf_Sym *sym) true, 20); } +static Elf_Sym *find_tosym_with_name(struct elf_info *elf, Elf_Addr addr, + Elf_Sym *sym, const char *name) +{ + /* If the supplied symbol has the expected name, return it. */ + if (!strcmp(sym_name(elf, sym), name)) + return sym; + + /* Look up a symbol with the given name. */ + return symsearch_find_with_name(elf, addr, get_secindex(elf, sym), + true, 20, name); +} + static bool is_executable_section(struct elf_info *elf, unsigned int secndx) { if (secndx >= elf->num_sections) @@ -1079,7 +1091,7 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf, static void check_export_symbol(struct module *mod, struct elf_info *elf, Elf_Addr faddr, const char *secname, - Elf_Sym *sym) + Elf_Sym *sym, Elf_Addr taddr) { static const char *prefix = "__export_symbol_"; const char *label_name, *name, *data; @@ -1096,6 +1108,14 @@ static void check_export_symbol(struct module *mod, struct elf_info *elf, return; } + name = label_name + strlen(prefix); + sym = find_tosym_with_name(elf, taddr, sym, name); + if (!sym) { + error("%s: could not find the the export symbol '%s'\n", + mod->name, name); + return; + } + if (ELF_ST_BIND(sym->st_info) != STB_GLOBAL && ELF_ST_BIND(sym->st_info) != STB_WEAK) { error("%s: local symbol '%s' was exported\n", mod->name, @@ -1103,13 +1123,6 @@ static void check_export_symbol(struct module *mod, struct elf_info *elf, return; } - name = sym_name(elf, sym); - if (strcmp(label_name + strlen(prefix), name)) { - error("%s: .export_symbol section references '%s', but it does not seem to be an export symbol\n", - mod->name, name); - return; - } - data = sym_get_data(elf, label); /* license */ if (!strcmp(data, "GPL")) { is_gpl = true; @@ -1156,7 +1169,7 @@ static void check_section_mismatch(struct module *mod, struct elf_info *elf, const struct sectioncheck *mismatch; if (module_enabled && elf->export_symbol_secndx == fsecndx) { - check_export_symbol(mod, elf, faddr, tosec, sym); + check_export_symbol(mod, elf, faddr, tosec, sym, taddr); return; }