From patchwork Thu Nov 2 06:56:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ying Huang X-Patchwork-Id: 78905 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BA9763858004 for ; Thu, 2 Nov 2023 06:56:35 +0000 (GMT) X-Original-To: elfutils-devel@sourceware.org Delivered-To: elfutils-devel@sourceware.org Received: from t03.bc.larksuite.com (t03.bc.larksuite.com [209.127.231.36]) by sourceware.org (Postfix) with UTF8SMTPS id 1CB8A3858D35 for ; Thu, 2 Nov 2023 06:56:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1CB8A3858D35 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=oss.cipunited.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=oss.cipunited.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1CB8A3858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.127.231.36 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698908189; cv=none; b=e7NKx6AU9/IitVsOEbfqcAHBe2bkG0+jM1yjsEmFc2/2SAOir415IHPCKw7ho5Os5kG4CjPmrMR63bEQaOMSfCqAuiKZMGXAqwMZv6kT3xvKiwghbxKRyqWLjM/gUdILY8O+gXnbFl1SPiOGIirzMq3ZYusmMzmQ3sg4LlveCN0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698908189; c=relaxed/simple; bh=GWOCVJ9dEQ/+yZa4ZDfWcoN05IXKwa082W697ivQiKo=; h=DKIM-Signature:Mime-Version:To:Subject:Message-Id:From:Date; b=nbP8zcw/uqbqKSjoQJS21z7nx12n8naCMDaUtx0KYLWcyzCV8P/fs90qP0plg5hLLMckD54eeRjBvyI8DR90lyP5Wvqdo5k9FI4EsVUkjtThQEnS5d2lPvrYl/r+bKP27DZWPi6AH1cFKmkZwUCkqFOp1MZG9aosV7SQ12/o8h4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=feishu2303200042; d=oss.cipunited.com; t=1698908181; h=from:subject:mime-version:from:date:message-id:subject:to:cc: reply-to:content-type:mime-version:in-reply-to:message-id; bh=fGYktzpcR/V7LqcGkCXR/uxkzrW3eKS3pMaZ8v71fEg=; b=JB/nU9H8+ZhOZVvGG8XM7PA8xsgjrom88z4A5sgJz0HP03AhPXJ2Cix7jTAns/ZnMqnzy1 oO8kMW1kYEGvXWhtXm52i17Q5FYkijZYfCgqA5l48SLnZNTvo5dz+fSzfcf8ZTWAYfVF21 2KXuL7vwCaMe61pEhulr5/Sbmw6TFVxFToy2RsD7MfdHdML/9Bww8stCwRO5+jvPeO52OU GuR/N/UWUsGa+/svX4AfoGJKSQVe1TIgsSGkdnurhDOCr1qkLcnORhHKya8IwrGzKbRUVd WeilCT3Ia4GJyN04vnGBTWBBY082SDi3uBEDsz0BQEm2Kuoeli3+B3iPeWVZkQ== Cc: , "Ying Huang" Mime-Version: 1.0 In-Reply-To: <20231102065602.3128526-1-ying.huang@oss.cipunited.com> X-Lms-Return-Path: To: Subject: [PATCH v2 3/5] elflint: adapt src/elflint --gnu src/nm on mips Message-Id: <20231102065602.3128526-4-ying.huang@oss.cipunited.com> From: "Ying Huang" Date: Thu, 2 Nov 2023 14:56:00 +0800 X-Original-From: Ying Huang References: <20231102065602.3128526-1-ying.huang@oss.cipunited.com> X-Mailer: git-send-email 2.30.2 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, 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 server2.sourceware.org X-BeenThere: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: elfutils-devel-bounces+patchwork=sourceware.org@sourceware.org From: Ying Huang The errors were: $ src/elflint --gnu src/nm section [ 2] '.MIPS.options' contains unknown flag(s) 0x8000000 section [ 7] '.dynsym': symbol 165 (_DYNAMIC_LINKING): non-local section symbol section [24] '.got' contains invalid processor-specific flag(s) 0x10000000 section [25] '.sdata' contains invalid processor-specific flag(s) 0x10000000 section [29] '.debug_aranges' has wrong type: expected PROGBITS, is MIPS_DWARF section [30] '.debug_info' has wrong type: expected PROGBITS, is MIPS_DWARF section [31] '.debug_abbrev' has wrong type: expected PROGBITS, is MIPS_DWARF section [32] '.debug_line' has wrong type: expected PROGBITS, is MIPS_DWARF section [33] '.debug_frame' has wrong type: expected PROGBITS, is MIPS_DWARF section [34] '.debug_str' has wrong type: expected PROGBITS, is MIPS_DWARF section [35] '.debug_loc' has wrong type: expected PROGBITS, is MIPS_DWARF section [36] '.debug_ranges' has wrong type: expected PROGBITS, is MIPS_DWARF section [38] '.symtab': symbol 785 (_gp): st_value out of bounds section [38] '.symtab': symbol 910 (_fbss): st_value out of bounds section [38] '.symtab': symbol 1051 (_DYNAMIC_LINKING): non-local section symbol After fixing: $ src/elflint --gnu src/nm No errors --- backends/mips_init.c | 3 +++ backends/mips_symbol.c | 37 +++++++++++++++++++++++++++++++++++++ src/elflint.c | 26 +++++++++++++++++++++----- 3 files changed, 61 insertions(+), 5 deletions(-) diff --git a/backends/mips_init.c b/backends/mips_init.c index 905d97eb..e883b7e4 100644 --- a/backends/mips_init.c +++ b/backends/mips_init.c @@ -51,9 +51,12 @@ mips_init (Elf *elf __attribute__ ((unused)), HOOK (eh, section_type_name); HOOK (eh, machine_flag_check); HOOK (eh, machine_flag_name); + HOOK (eh, machine_section_flag_check); HOOK (eh, segment_type_name); HOOK (eh, dynamic_tag_check); HOOK (eh, dynamic_tag_name); HOOK (eh, check_object_attribute); + HOOK (eh, check_special_symbol); + HOOK (eh, check_reloc_target_type); return eh; } diff --git a/backends/mips_symbol.c b/backends/mips_symbol.c index 6418a01d..1e3d55c4 100644 --- a/backends/mips_symbol.c +++ b/backends/mips_symbol.c @@ -158,6 +158,43 @@ mips_section_type_name (int type, return NULL; } +bool +mips_check_reloc_target_type (Ebl *ebl __attribute__ ((unused)), Elf64_Word sh_type) +{ + return (sh_type == SHT_MIPS_DWARF); +} + +/* Check whether given symbol's st_value and st_size are OK despite failing + normal checks. */ +bool +mips_check_special_symbol (Elf *elf, + const GElf_Sym *sym __attribute__ ((unused)), + const char *name __attribute__ ((unused)), + const GElf_Shdr *destshdr) +{ + size_t shstrndx; + if (elf_getshdrstrndx (elf, &shstrndx) != 0) + return false; + const char *sname = elf_strptr (elf, shstrndx, destshdr->sh_name); + if (sname == NULL) + return false; + return (strcmp (sname, ".got") == 0 || strcmp (sname, ".bss") == 0); +} + +/* Check whether SHF_MASKPROC flags are valid. */ +bool +mips_machine_section_flag_check (GElf_Xword sh_flags) +{ + return ((sh_flags &~ (SHF_MIPS_GPREL | + SHF_MIPS_MERGE | + SHF_MIPS_ADDR | + SHF_MIPS_STRINGS | + SHF_MIPS_NOSTRIP | + SHF_MIPS_LOCAL | + SHF_MIPS_NAMES | + SHF_MIPS_NODUPE)) == 0); +} + /* Check whether machine flags are valid. */ bool mips_machine_flag_check (GElf_Word flags) diff --git a/src/elflint.c b/src/elflint.c index 864de710..092409a2 100644 --- a/src/elflint.c +++ b/src/elflint.c @@ -936,7 +936,9 @@ section [%2d] '%s': symbol %zu (%s): non-local symbol outside range described in } if (GELF_ST_TYPE (sym->st_info) == STT_SECTION - && GELF_ST_BIND (sym->st_info) != STB_LOCAL) + && GELF_ST_BIND (sym->st_info) != STB_LOCAL + && ehdr->e_machine != EM_MIPS + && strcmp (name, "_DYNAMIC_LINKING") != 0) ERROR (_("\ section [%2d] '%s': symbol %zu (%s): non-local section symbol\n"), idx, section_name (ebl, idx), cnt, name); @@ -3828,6 +3830,10 @@ cannot get section header for section [%2zu] '%s': %s\n"), && ebl_bss_plt_p (ebl)) good_type = SHT_NOBITS; + if (ehdr->e_machine == EM_MIPS + && (strstr(special_sections[s].name, ".debug") != NULL)) + good_type = SHT_MIPS_DWARF; + /* In a debuginfo file, any normal section can be SHT_NOBITS. This is only invalid for DWARF sections and .shstrtab. */ if (shdr->sh_type != good_type @@ -3988,12 +3994,21 @@ section [%2zu] '%s': size not multiple of entry size\n"), ERROR (_("section [%2zu] '%s'" " contains invalid processor-specific flag(s)" " %#" PRIx64 "\n"), - cnt, section_name (ebl, cnt), sh_flags & SHF_MASKPROC); + cnt, section_name (ebl, cnt), sh_flags & SHF_MASKPROC); sh_flags &= ~(GElf_Xword) SHF_MASKPROC; } if (sh_flags & SHF_MASKOS) - if (gnuld) - sh_flags &= ~(GElf_Xword) SHF_GNU_RETAIN; + { + if (gnuld) + sh_flags &= ~(GElf_Xword) SHF_GNU_RETAIN; + if (!ebl_machine_section_flag_check (ebl, + sh_flags & SHF_MASKOS)) + ERROR (_("section [%2zu] '%s'" + " contains invalid os-specific flag(s)" + " %#" PRIx64 "\n"), + cnt, section_name (ebl, cnt), sh_flags & SHF_MASKOS); + sh_flags &= ~(GElf_Xword) SHF_MASKOS; + } if (sh_flags != 0) ERROR (_("section [%2zu] '%s' contains unknown flag(s)" " %#" PRIx64 "\n"), @@ -4059,6 +4074,7 @@ section [%2zu] '%s': merge flag set but entry size is zero\n"), switch (shdr->sh_type) { case SHT_PROGBITS: + case SHT_MIPS_DWARF: break; case SHT_NOBITS: @@ -4716,7 +4732,7 @@ program header offset in ELF header and PHDR entry do not match")); if (shdr != NULL && ((is_debuginfo && shdr->sh_type == SHT_NOBITS) || (! is_debuginfo - && (shdr->sh_type == SHT_PROGBITS + && (is_debug_section_type(shdr->sh_type) || shdr->sh_type == SHT_X86_64_UNWIND))) && elf_strptr (ebl->elf, shstrndx, shdr->sh_name) != NULL && ! strcmp (".eh_frame_hdr",