From patchwork Sun Dec 4 21:52:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 29463 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1951928wrr; Sun, 4 Dec 2022 13:53:11 -0800 (PST) X-Google-Smtp-Source: AA0mqf4ey6/rQE6s7MobWKtI85OEUhRk1/0UaF+p/ALm7avff3dE7sB86qSF6KecwfdGfS9DY5AB X-Received: by 2002:a17:907:c70c:b0:7c0:7c22:566b with SMTP id ty12-20020a170907c70c00b007c07c22566bmr7024763ejc.601.1670190791033; Sun, 04 Dec 2022 13:53:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670190791; cv=none; d=google.com; s=arc-20160816; b=eW9TqkVZoEAmTwERPp9hcblknSCL6fE163PHR7EviWmwzPDhJMZC2PUsy/rF0Rd1rY sLQRN44VvMdsDP7fWYRTcX+Fguevic+nCTd8Eax1CxcCB3qE8jXROS3fz4ug23cue55+ lE6c4xFCdkSCAbDSouF+AhIRr266f+yWHwMTqpKB1wFQ/hTFG+JlsfHwZ85opc15azEl /E9fE0Jk+SrCQeekm8Z33uoQ0RbmWUZK+LkukgNmg4yYG2CUw7VMqMQp59oIfO8w2AEH vKnD+3bRAdeb2AXW65fDbyO7TpUFZHWfM46qt8RiO2rjERKpk/hAAA0R2oyQr0Y3zIUK qerg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=/qJ3LLzwFBJKi9tRmZbi+6eC82Skt/MGkFdUV7RK6qQ=; b=LyN9Ru65Q8kbw2MT2ovQd/wHKZgqe+UwAorctZXJjw2FNPv0eW1Vnrzzjvl7obhuBN QhvzVla+7TclZ65z71+4LicOHO4RjeE8D3KWZbv+rBiFwOT4Xa7uxrRdeesN3wlI/mGQ WGPtgAw1dgpggezenwMcU5vh5KlgOgIl2mLTKrYzuxbsXyBCMcfP3JspFYkShkLDW2zm 0ULDBbOUr9HAi0De2VD6r/yQek8Ak23p1JzdmgAvyyzBY3AkLPsX4SHVKkfVHTqU1hX8 vssrDKozAKrZk/QXqrLcw44a8CFtwBiMUYnAKmd8qlO0R94hCb98hy56+QYmavAdFI6Y Fv6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=M5acEQ2a; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id ji21-20020a170907981500b0078decbc3f73si11006542ejc.460.2022.12.04.13.53.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 13:53:10 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=M5acEQ2a; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CB40A38425B9 for ; Sun, 4 Dec 2022 21:53:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CB40A38425B9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670190789; bh=/qJ3LLzwFBJKi9tRmZbi+6eC82Skt/MGkFdUV7RK6qQ=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=M5acEQ2a3Zn+DqPZSNYRtcWvoWfvc0QEPIUbamqAIzKcGmUndeOIUfcUzo8ggr5tj dHujXN/qu0l7gGQfhJlpfilrddifo6swqlRMAXgpwxXh4+HmotkqLuFZsfx9RBD/WV jOZJnB9d28SP90GfUnTAQXQV5stFikvqEt131rzY= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by sourceware.org (Postfix) with ESMTPS id 4F28538432F2 for ; Sun, 4 Dec 2022 21:52:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4F28538432F2 Received: by mail-pl1-x630.google.com with SMTP id k7so9175892pll.6 for ; Sun, 04 Dec 2022 13:52:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/qJ3LLzwFBJKi9tRmZbi+6eC82Skt/MGkFdUV7RK6qQ=; b=eDlOGwE7iElRSzQ9S8+JyiXHYIESrz9LbSzk0pIiY2bNdPsNk3xvfpGjEeIEop3fF8 EDO56lCFZRX0VgC+T4BkdUJAglQ99MVcgsBcF7WwzjCZt0IqTnWOD6bqRlupQkTR0d4P 4z4gIsfGuZuiRCNfOfCEvrmACaX71Pwk1GpORXMTHhBQIiuujTIhnKctvVXU+fc7mmpu JoWeX/sGhV3+/dVNsyYPJmPlf3VZD22Hu5ZK6Do2kqAhr9Ely6oobQnwY/uTobWUxq2L pXSuSY/o/h8J3NHb3fwA7Jn1sF75J/l/AICPaH1g6UpYMgyErnT7ca0wUY8tn+zdgSjj iq/g== X-Gm-Message-State: ANoB5pkV1EW0wVF07Pt/G/1LFv5AhcVL+Iy0qnHIJlem2Pyeq91v7RIw /7K6RNzmy/DwLGQVnl98YrLrGexisLE= X-Received: by 2002:a17:90a:6d62:b0:219:4ee5:ccc9 with SMTP id z89-20020a17090a6d6200b002194ee5ccc9mr30215434pjj.63.1670190768952; Sun, 04 Dec 2022 13:52:48 -0800 (PST) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:5a8:d2a4:2872:fda9]) by smtp.gmail.com with ESMTPSA id o13-20020a170902778d00b00176ba091cd3sm9129924pll.196.2022.12.04.13.52.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 13:52:48 -0800 (PST) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 1AE601142D17; Mon, 5 Dec 2022 08:22:46 +1030 (ACDT) Date: Mon, 5 Dec 2022 08:22:46 +1030 To: binutils@sourceware.org Subject: PR29846, segmentation fault in objdump.c compare_symbols Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3035.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alan Modra via Binutils From: Alan Modra Reply-To: Alan Modra Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751321978931722066?= X-GMAIL-MSGID: =?utf-8?q?1751321978931722066?= Fixes a fuzzed object file problem where plt relocs were manipulated in such a way that two synthetic symbols were generated at the same plt location. Won't occur in real object files. PR 29846 PR 20337 * objdump.c (compare_symbols): Test symbol flags to exclude section and synthetic symbols before attempting to check flavour. diff --git a/binutils/objdump.c b/binutils/objdump.c index e8481b2d928..d95c8b68bf0 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -1222,20 +1222,17 @@ compare_symbols (const void *ap, const void *bp) return 1; } - if (bfd_get_flavour (bfd_asymbol_bfd (a)) == bfd_target_elf_flavour + /* Sort larger size ELF symbols before smaller. See PR20337. */ + bfd_vma asz = 0; + if ((a->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) == 0 + && bfd_get_flavour (bfd_asymbol_bfd (a)) == bfd_target_elf_flavour) + asz = ((elf_symbol_type *) a)->internal_elf_sym.st_size; + bfd_vma bsz = 0; + if ((b->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) == 0 && bfd_get_flavour (bfd_asymbol_bfd (b)) == bfd_target_elf_flavour) - { - bfd_vma asz, bsz; - - asz = 0; - if ((a->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) == 0) - asz = ((elf_symbol_type *) a)->internal_elf_sym.st_size; - bsz = 0; - if ((b->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) == 0) - bsz = ((elf_symbol_type *) b)->internal_elf_sym.st_size; - if (asz != bsz) - return asz > bsz ? -1 : 1; - } + bsz = ((elf_symbol_type *) b)->internal_elf_sym.st_size; + if (asz != bsz) + return asz > bsz ? -1 : 1; /* Symbols that start with '.' might be section names, so sort them after symbols that don't start with '.'. */