From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 DEE23C2D0ED for ; Thu, 26 Mar 2020 23:24:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA5012082D for ; Thu, 26 Mar 2020 23:24:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585265058; bh=a4WdJga4dK8na8e33NYHsjWkbrP1pxfPuQbLNKbqrcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ub+z90e+dT0fWBn4eHUms3YqqZQz0h9RSAikZydgU7jqNFtAa0skblktF/6uAj5MU lJTmgTr7FOn6aNsQ768MRHAeIgjFEOeGrAtaH0ZWPLGQa6EODEdbYa9QByNs6vMOSe BAsvn9VgTAkyMIAIsOSL4tKPEWty6OYPYQaYTiYY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727817AbgCZXYS (ORCPT ); Thu, 26 Mar 2020 19:24:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:43740 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727799AbgCZXYR (ORCPT ); Thu, 26 Mar 2020 19:24:17 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E70DC2077D; Thu, 26 Mar 2020 23:24:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585265056; bh=a4WdJga4dK8na8e33NYHsjWkbrP1pxfPuQbLNKbqrcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2kRx80S4YQW+f0fmtFywYLHin846Kd67z+EKSoqL9+QCzKyT/hGZiq8KJIFVhmkcM FEkxvmwomNVTeDjO+FfHIlf83ncwh67bZzV3FXajhB405sfKVNi9sDr0jsr7Qsh4+A BaNUeKlRo0EtbGIS9IWQ/djM/yDyAYP0QGBvat2U= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiao Yang , Masahiro Yamada , Sasha Levin , linux-kbuild@vger.kernel.org Subject: [PATCH AUTOSEL 5.5 16/28] modpost: Get proper section index by get_secindex() instead of st_shndx Date: Thu, 26 Mar 2020 19:23:45 -0400 Message-Id: <20200326232357.7516-16-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200326232357.7516-1-sashal@kernel.org> References: <20200326232357.7516-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Xiao Yang [ Upstream commit 4b8a5cfb5fd375cf4c7502a18f0096ed2881be27 ] (uint16_t) st_shndx is limited to 65535(i.e. SHN_XINDEX) so sym_get_data() gets wrong section index by st_shndx if requested symbol contains extended section index that is more than 65535. In this case, we need to get proper section index by .symtab_shndx section. Module.symvers generated by building kernel with "-ffunction-sections -fdata-sections" shows the issue. Fixes: 56067812d5b0 ("kbuild: modversions: add infrastructure for emitting relative CRCs") Fixes: e84f9fbbece1 ("modpost: refactor namespace_from_kstrtabns() to not hard-code section name") Signed-off-by: Xiao Yang Signed-off-by: Masahiro Yamada Signed-off-by: Sasha Levin --- scripts/mod/modpost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 6e892c93d104a..90aaf29c61a0f 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -307,7 +307,8 @@ static const char *sec_name(struct elf_info *elf, int secindex) static void *sym_get_data(const struct elf_info *info, const Elf_Sym *sym) { - Elf_Shdr *sechdr = &info->sechdrs[sym->st_shndx]; + unsigned int secindex = get_secindex(info, sym); + Elf_Shdr *sechdr = &info->sechdrs[secindex]; unsigned long offset; offset = sym->st_value; -- 2.20.1