From nobody Mon Mar 06 17:52:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVmPx1pgYz3wBgt; Mon, 6 Mar 2023 17:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVmPx17Bwz46xQ; Mon, 6 Mar 2023 17:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678125173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XhR7LCYXUoPwEgL1U9Ge5fr9fIjmo8G4ZpFgApLY2SY=; b=h+AcTNhNIEbKLxKu88XM3c3SjYPfmN3GoRQl30vwb+VpPgNsNC40PAulBux/AHm1uOiOvL gdc8hIyPLrav1ayr8JBXPDTRScKnORPmDBBibJGzfLCko0q5mtOc9saff94jYVbIIixerh 6u38LIuaFd7m3YgF3Z+pOiymou1+XC/qQNjKQk05Ycx1xVjdXyp9ro5ahl6Jj2pl+2sZ51 n/LorV2fulOQE5xuHE5/+NHR6GdDdG+01rRbtYtnlZXqN9khcqXYxzDg49BR2lNIsoNpAa 3bW+c5EKB0oo1SO8OwUSj1roiihrOF31hj+t+kbsL92xqi5FA8DQE8f0/fGjKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678125173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XhR7LCYXUoPwEgL1U9Ge5fr9fIjmo8G4ZpFgApLY2SY=; b=R9sblNaHgRXTs50v9Ddd+wvL0uFsbnri4MxCcsfd1DWhBMyWiVbcPCcj+C7J/+K7oxxINV SEK2MYof/HItmu1pYseyT9F4ps3Hh8evC1GsjkkAPChTmmf/VwKz3zht7JDxXEyZhfahX8 etOwR6byAdX5vkkeRfS3ZcxAYjGyVYHe61LbAYlwezFj5KDxj9OTRy+7lthLYrKJehm5HO 9MKRvVR8DQpWD17VSB40YXQpxUtSxPQ7N7BJm3scDfucM+MVXYGupxOQL84nQJWgGsdGGv B47BwXueixASBnBf+a9fqzXxDYxxO2FhPxyUiIHVF80G5mKy7cn+oWURIyrR1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678125173; a=rsa-sha256; cv=none; b=DWYg4TrixBASMGMzPkbvc+zqN6bz893pmoKU1PT4bU2NdMpINCSW4Hh+X9YwjszCc/1ie5 STIKve2GgEfPWTRm4+xH4y8NDKMMs4NnHdxSLNw8sx4tMy9iT8KWfuQhhfYX87Kq4fyL5l 81F/pJ7XU0/CyOPO0YBk7QGjAsJAE4u4mhXGwbI+XFkNAq8GpE8k4pnfLmA9NQWNqVyC7F 31z5r0UmeLWLDuEJUp514ywEF4tB5rDVV/KPGzrBuJaV7os/xzJ8equdv6mpuyUKtd7O/I ksf4eHZVDNG65lKNTNQL8+001z6zoTgKccKdN8qxo0cqW6SzIi/YqdLulW3rPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PVmPx0Cl6z19nV; Mon, 6 Mar 2023 17:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326Hqq9B053231; Mon, 6 Mar 2023 17:52:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326HqqW3053230; Mon, 6 Mar 2023 17:52:52 GMT (envelope-from git) Date: Mon, 6 Mar 2023 17:52:52 GMT Message-Id: <202303061752.326HqqW3053230@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: cec2d0b1c7ac - main - readelf: fix -wR option, memory leaks, and -wf minor bug List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cec2d0b1c7ac3196613813c0b07a2387916a8ccd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cec2d0b1c7ac3196613813c0b07a2387916a8ccd commit cec2d0b1c7ac3196613813c0b07a2387916a8ccd Author: Christos Margiolis AuthorDate: 2023-03-06 17:50:13 +0000 Commit: Mark Johnston CommitDate: 2023-03-06 17:51:23 +0000 readelf: fix -wR option, memory leaks, and -wf minor bug Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38419 --- contrib/elftoolchain/readelf/readelf.c | 39 ++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/contrib/elftoolchain/readelf/readelf.c b/contrib/elftoolchain/readelf/readelf.c index 77125b77ebef..daaa7bf62dff 100644 --- a/contrib/elftoolchain/readelf/readelf.c +++ b/contrib/elftoolchain/readelf/readelf.c @@ -4938,8 +4938,10 @@ dump_dwarf_line(struct readelf *re) return; } if (dwarf_attrval_unsigned(die, DW_AT_stmt_list, &offset, - &de) != DW_DLV_OK) + &de) != DW_DLV_OK) { + dwarf_dealloc(re->dbg, die, DW_DLA_DIE); continue; + } length = re->dw_read(d, &offset, 4); if (length == 0xffffffff) { @@ -4950,6 +4952,7 @@ dump_dwarf_line(struct readelf *re) if (length > d->d_size - offset) { warnx("invalid .dwarf_line section"); + dwarf_dealloc(re->dbg, die, DW_DLA_DIE); continue; } @@ -5147,9 +5150,8 @@ dump_dwarf_line(struct readelf *re) (uintmax_t) line); p++; } - - } + dwarf_dealloc(re->dbg, die, DW_DLA_DIE); } if (ret == DW_DLV_ERROR) warnx("dwarf_next_cu_header: %s", dwarf_errmsg(de)); @@ -5192,9 +5194,9 @@ dump_dwarf_line_decoded(struct readelf *re) printf("%-37s %11s %s\n", "Filename", "Line Number", "Starting Address"); if (dwarf_srclines(die, &linebuf, &linecount, &de) != DW_DLV_OK) - continue; + goto done; if (dwarf_srcfiles(die, &srcfiles, &srccount, &de) != DW_DLV_OK) - continue; + goto done; for (i = 0; i < linecount; i++) { ln = linebuf[i]; if (dwarf_line_srcfileno(ln, &fn, &de) != DW_DLV_OK) @@ -5208,6 +5210,8 @@ dump_dwarf_line_decoded(struct readelf *re) (uintmax_t) lineaddr); } putchar('\n'); +done: + dwarf_dealloc(re->dbg, die, DW_DLA_DIE); } } @@ -5840,7 +5844,8 @@ dump_dwarf_ranges_foreach(struct readelf *re, Dwarf_Die die, Dwarf_Addr base) Dwarf_Addr base0; Dwarf_Half attr; Dwarf_Signed attr_count, cnt; - Dwarf_Unsigned off, bytecnt; + Dwarf_Unsigned bytecnt; + Dwarf_Off off; int i, j, ret; if ((ret = dwarf_attrlist(die, &attr_list, &attr_count, &de)) != @@ -5857,11 +5862,12 @@ dump_dwarf_ranges_foreach(struct readelf *re, Dwarf_Die die, Dwarf_Addr base) } if (attr != DW_AT_ranges) continue; - if (dwarf_formudata(attr_list[i], &off, &de) != DW_DLV_OK) { - warnx("dwarf_formudata failed: %s", dwarf_errmsg(de)); + if (dwarf_global_formref(attr_list[i], &off, &de) != DW_DLV_OK) { + warnx("dwarf_global_formref failed: %s", + dwarf_errmsg(de)); continue; } - if (dwarf_get_ranges(re->dbg, (Dwarf_Off) off, &ranges, &cnt, + if (dwarf_get_ranges(re->dbg, off, &ranges, &cnt, &bytecnt, &de) != DW_DLV_OK) continue; base0 = base; @@ -5900,6 +5906,8 @@ cont_search: warnx("dwarf_siblingof: %s", dwarf_errmsg(de)); else if (ret == DW_DLV_OK) dump_dwarf_ranges_foreach(re, ret_die, base); + + dwarf_dealloc(re->dbg, die, DW_DLA_DIE); } static void @@ -6204,7 +6212,7 @@ dump_dwarf_frame_section(struct readelf *re, struct section *s, int alt) Dwarf_Small cie_version; Dwarf_Ptr fde_addr, fde_inst, cie_inst; char *cie_aug, c; - int i, eh_frame; + int i, ret, eh_frame; Dwarf_Error de; printf("\nThe section %s contains:\n\n", s->name); @@ -6219,10 +6227,13 @@ dump_dwarf_frame_section(struct readelf *re, struct section *s, int alt) } } else if (!strcmp(s->name, ".eh_frame")) { eh_frame = 1; - if (dwarf_get_fde_list_eh(re->dbg, &cie_list, &cie_count, - &fde_list, &fde_count, &de) != DW_DLV_OK) { - warnx("dwarf_get_fde_list_eh failed: %s", - dwarf_errmsg(de)); + ret = dwarf_get_fde_list_eh(re->dbg, &cie_list, &cie_count, + &fde_list, &fde_count, &de); + if (ret != DW_DLV_OK) { + if (ret == DW_DLV_ERROR) { + warnx("dwarf_get_fde_list_eh failed: %s", + dwarf_errmsg(de)); + } return; } } else