From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by sourceware.org (Postfix) with ESMTPS id 73BF538582BC for ; Mon, 9 Jan 2023 23:40:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 73BF538582BC Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-x62a.google.com with SMTP id p24so11315392plw.11 for ; Mon, 09 Jan 2023 15:40:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=Y2g+oTa0KDVKpK8C/XsLbNHsKTfzcpBvbTk9bOQ1QtY=; b=UPaxlAUXJDHKXYzkilrCAqo4lJTVkHzuq1ZrLdBABqO2q+ZtB9A2zPCcAiPUJ8wb9q 0myQDoQbh1sjiBUsc4I5S/9HGqiqMuxqpAUfXHpJCMMUpJ4WwuE/A9ukqdmeFO/Ph7FC rc9FP916iLO0+3DLpJC/DvT3nM5qHfk8Hwx+W+ZVSocNAnTmJohjb2ZEZ5zXD/4JyYVB WiOqqt9GnWfWOjErftM07AlGoBrH3U11YeF0X1978mj0MeycZmatFSbVHXzuk4kPoAxZ xHMcUzH67mRYVKE/QswRJkOeSw/wCu+CkKcSc2f1mJ6juOioZcAZJfvxs/KY5KLcAcyo K97w== 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=Y2g+oTa0KDVKpK8C/XsLbNHsKTfzcpBvbTk9bOQ1QtY=; b=7P9ar0pADz7cdlRoK2/zdpBg7R7BLFpUWLourx98JT+1fKHx6UUu9bCQCmHL/AK3Cz aJimq66o4Hl5yBKorACj1QQrXjniDjsxOzXH43sIylOiUzP7Z9kn0NAhllsSzPMTFWCh 5Vokj8Vl7saBKaEcY3AO2OWguEm4OnG0WWrYhPiQ0bUKNLFEOpKPyGG9/09P288JeC9V HEv4n+bdiBO0r/eO5KWStZALu0XMl2pK5AAKkl7lZ5ytaEQb5NVSxa4FbvhNbQDMNXXI sa+2mTbnQ+JbNyLF8AJc5xSIrma+Cxv6y2hBmERZxZpBrWccZG7ZWDvyonxVNuL6G1Tf 1p3Q== X-Gm-Message-State: AFqh2kqXfSXE0EfTyzBOoMgxaRwXlmboXEhyn3BO8gDM2pTtBSn189Yl 49Oo8GnmcDCVIkMj7gjsPMctGrUzTio= X-Google-Smtp-Source: AMrXdXsm37PsMUR4GuKQrea1/c3w39FyJz8ovmQGt7XFnePzfS4/rIgt0IcU2KsI94VyrhVfM0rmsQ== X-Received: by 2002:a17:90a:cf8d:b0:227:1c1e:751b with SMTP id i13-20020a17090acf8d00b002271c1e751bmr3976191pju.32.1673307607316; Mon, 09 Jan 2023 15:40:07 -0800 (PST) Received: from squeak.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id gk19-20020a17090b119300b00218f9bd50c7sm5977962pjb.50.2023.01.09.15.40.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 15:40:06 -0800 (PST) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 555281142CDB; Tue, 10 Jan 2023 10:10:04 +1030 (ACDT) Date: Tue, 10 Jan 2023 10:10:04 +1030 From: Alan Modra To: binutils@sourceware.org Subject: Set dwarf2 stash pointer earlier Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3035.8 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 List-Id: This fixes a memory leak in the vanishingly rare cases (found by fuzzers of course) when something goes wrong in the save_section_vma, htab_create_alloc or alloc_trie_leaf calls before *pinfo is written. If *pinfo is not written, _bfd_dwarf2_cleanup_debug_info won't be able to free that memory. * dwarf2.c (_bfd_dwarf2_slurp_debug_info): Save stash pointer on setting up stash. diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c index f689eebbd88..bd431805d2a 100644 --- a/bfd/dwarf2.c +++ b/bfd/dwarf2.c @@ -5408,6 +5408,7 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd, bfd *debug_bfd, stash = (struct dwarf2_debug *) bfd_zalloc (abfd, amt); if (! stash) return false; + *pinfo = stash; } stash->orig_bfd = abfd; stash->debug_sections = debug_sections; @@ -5433,8 +5434,6 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd, bfd *debug_bfd, if (!stash->alt.trie_root) return false; - *pinfo = stash; - if (debug_bfd == NULL) debug_bfd = abfd; -- Alan Modra Australia Development Lab, IBM