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

1 files changed, 37 insertions, 1 deletions

diff --git a/contrib/elftoolchain/readelf/readelf.c b/contrib/elftoolchain/readelf/readelf.c
index 43585459d82e..d49505756fef 100644
--- a/contrib/elftoolchain/readelf/readelf.c
+++ b/contrib/elftoolchain/readelf/readelf.c
@@ -47,6 +47,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <vis.h>
 #include <zlib.h>
 
 #include <libcasper.h>
@@ -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)
@@ -1164,6 +1168,15 @@ note_type(const char *name, unsigned int et, unsigned int 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)
 {
 	switch (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)