From nobody Sun Jul 26 16:35:48 2026 X-Original-To: dev-commits-src-branches@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 4h7S5c4SSZz6nCfc for ; Sun, 26 Jul 2026 16:35:48 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h7S5c3sQfz43v4 for ; Sun, 26 Jul 2026 16:35:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785083748; 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=YgG9pTMOa4nF+YSP0ATS1emD+lvL4bQFX41klWPfk3I=; b=pvgBpkoCHp3n4nweVqTUzkWXMu2OTVfsyUYk1rac/l1OJIj7l1XQgv9rYEEPFgXr+Wvhjg vIiw9YGLc0IlAqZA0x3g/21HUp86Z78mTWXdMZzCjqvBowUXWjp1Cpm2aaagQ9iVCcepjf 2bqu5gixt6BPmlB8biUqAhfQoe+Kv/EGhRkM5tfECv1g7IppJrO4UwlpBlEp31HehN7uU6 hQH6tB9U51ieMUlDy06ALGpiJ6noDmjJV9g/Xoawmb+t3pD7AbOWws3KESXqLEILemSkLz hiSly0Y/ZX5U7qbePjO+ODAfFgUVfmbRtrjiZikzkMJ/aD3ubNxRIw08JouNVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785083748; a=rsa-sha256; cv=none; b=YOHYS8Qh1+GIvQ/xRGYDuKLRiUF3jtOCzqc1yr15kJ4qFfARAg5dhpyfSQzZPmCxyZ9/4O XRJbJnlR29Gl+K2fKTm+ro7Dl8Z86TfI6ssA7vw+y6bqX0oQS7pgVvJxtLqHH4EHRJSs5S UscFgfLgI+d7gYnvdqK96wWIQsdO5KZbuYCYSsMePkuFg6sI1uNtGKgU7+dJtKMtpkz0+l oZ20wW4OJXD8ZSRm02ti2c0Jaa/oe3lg/ioowi6hDWfWEW+UoU26om735l8v4roNiAHael BDTLbDL8MpMGOnLF5V40yBnlYFSIxF83wDpp8QzebSxjsgKPvvkMOHDVsHlNRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785083748; 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=YgG9pTMOa4nF+YSP0ATS1emD+lvL4bQFX41klWPfk3I=; b=P+Br/hiAMTW4/RbtM38+/XOUq0CHesrD6+qFJ86nO56KGPdcAdf3FL2Yfn+38lgqj/A8WK 8o9N8etkVqeRb30QowmwFFUv/hfJrkrfkq4EENAITECj+mIfmYowkhr6bbWVhv/gSTuy3G QiANl8XVj8tq0WnYS5GeLl0MljmrooOmrvMwelAn7a/ec+/yv33IDtAQ48c4zXQIsI2WNf c2vBaFJKf+H7s6WnsvNZCyfDHD9b+m34z/3MQYpiST7deArZzq/AXTlYz/ti6/8kTlaBNj gmw9FcbTipyEu54mXGWmTyu/fNxJq1hmgOlxXkQ7PpqIAqFnTrkwEwrCryGZYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h7S5c2PvZzVfS for ; Sun, 26 Jul 2026 16:35:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e12a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Jul 2026 16:35:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 74051cfb3d18 - stable/15 - readelf: Add support for ELF package metadata note List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 74051cfb3d18bf6881afb8f19c3c0ccdfc2424ff Auto-Submitted: auto-generated Date: Sun, 26 Jul 2026 16:35:48 +0000 Message-Id: <6a663764.1e12a.4e5e1bf0@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=74051cfb3d18bf6881afb8f19c3c0ccdfc2424ff commit 74051cfb3d18bf6881afb8f19c3c0ccdfc2424ff Author: Ed Maste AuthorDate: 2022-04-20 14:12:06 +0000 Commit: Ed Maste CommitDate: 2026-07-26 16:35:27 +0000 readelf: Add support for ELF package metadata note We don't use this note type today, but as a general purpose ELF diagnostic tool readelf(1) ought to decode it. References: https://fedoraproject.org/wiki/Changes/Package_information_on_ELF_objects https://systemd.io/ELF_PACKAGE_METADATA/ Reviewed by: fuz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47524 (cherry picked from commit c18512056301fa97dd31c4cc9a78e18f1aa8b2d5) --- contrib/elftoolchain/readelf/readelf.c | 38 +++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/contrib/elftoolchain/readelf/readelf.c b/contrib/elftoolchain/readelf/readelf.c index daaa7bf62dff..3f0b9bfaa887 100644 --- a/contrib/elftoolchain/readelf/readelf.c +++ b/contrib/elftoolchain/readelf/readelf.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -371,6 +372,7 @@ static int loc_at_comparator(const void *la1, const void *la2); static const char *mips_abi_fp(uint64_t fp); static const char *note_type(const char *note_name, unsigned int et, unsigned int nt); +static const char *note_type_fdo(unsigned int nt); static const char *note_type_freebsd(unsigned int nt); static const char *note_type_freebsd_core(unsigned int nt); static const char *note_type_go(unsigned int nt); @@ -1150,6 +1152,8 @@ note_type(const char *name, unsigned int et, unsigned int nt) return note_type_freebsd_core(nt); else return note_type_freebsd(nt); + else if (strcmp(name, "FDO") == 0 && et != ET_CORE) + return note_type_fdo(nt); else if (strcmp(name, "GNU") == 0 && et != ET_CORE) return note_type_gnu(nt); else if (strcmp(name, "Go") == 0 && et != ET_CORE) @@ -1163,6 +1167,15 @@ note_type(const char *name, unsigned int et, unsigned int nt) return note_type_unknown(nt); } +static const char * +note_type_fdo(unsigned int nt) +{ + switch (nt) { + case NT_FDO_PACKAGING_METADATA: return "NT_FDO_PACKAGING_METADATA"; + default: return (note_type_unknown(nt)); + } +} + static const char * note_type_freebsd(unsigned int nt) { @@ -3819,7 +3832,30 @@ dump_notes_data(struct readelf *re, const char *name, uint32_t type, } ubuf = (const uint32_t *)(const void *)buf; - if (strcmp(name, "FreeBSD") == 0) { + if (strcmp(name, "FDO") == 0) { + switch (type) { + case NT_FDO_PACKAGING_METADATA: + { + char *visbuf; + + if (sz > SIZE_MAX / 4 - 1) { + warnx("invalid note data"); + return; + } + /* Ignore trailing NULs. */ + while (sz > 0 && buf[sz - 1] == '\0') { + sz--; + } + if ((visbuf = malloc(sz * 4 + 1)) == NULL) { + err(1, "malloc"); + } + (void)strvisx(visbuf, buf, sz, VIS_CSTYLE); + printf(" Package metadata: %s\n", visbuf); + free(visbuf); + return; + } + } + } else if (strcmp(name, "FreeBSD") == 0) { switch (type) { case NT_FREEBSD_ABI_TAG: if (sz != 4)