From patchwork Sun Nov 21 19:43:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: lilydjwg--- via Elfutils-devel X-Patchwork-Id: 47980 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A65D13858416 for ; Sun, 21 Nov 2021 19:43:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A65D13858416 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1637523815; bh=tnRPjxtPLy4Bt2B18SJwlB0P3L6H+1AptvyKFkHtCUI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=S/BfcLh6+/ggaGOE5NZEKuF+P5LmALOyLjTNSa8MQeHoDimNiYF/k/cqePc2u+l3e Sdip6Ze29pxEp2DVyhugO/2lG7jfQBW4ciMQS3NYFDjAkr3qPgNq87/CDvR16mnlaX 1ETeMthwm+3/eaOy0Mo3DtRBMzgNb3hCHcAGTHWs= X-Original-To: elfutils-devel@sourceware.org Delivered-To: elfutils-devel@sourceware.org Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id 824A73858D3C for ; Sun, 21 Nov 2021 19:43:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 824A73858D3C Received: by mail-wm1-x32f.google.com with SMTP id ay10-20020a05600c1e0a00b0033aa12cdd33so2035625wmb.1 for ; Sun, 21 Nov 2021 11:43:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tnRPjxtPLy4Bt2B18SJwlB0P3L6H+1AptvyKFkHtCUI=; b=tAPzNDih7xRqsrJzyfctL6b8N9G/nhuj76WRJYv/PX8q8tXy7QMTEaSPNNlbqbU2RE IFGmVke200X4/VzBj3evoB89dKtI3ZbbFPu/guamchrj8oKGEz2/Ug9hgcaYZkk3FDp4 WfPWpbZxsYigszNGkVc4kVL2pyj4QNHnz2xEOB4G168CpGYsZhXHnrXYrhj7ApKhj65M XExfmFWo7fyxjR5j2ozufEuHHUueHdLazhhoMx7vhycJDaPwnj1d08n0ehUhGJP0GmeT Zwsi2xkybveN0swTxp72nF7DTUCPnHjChVZxZnkPXbyIeLzmhSW7aeHvRzT0m+0TfhmS i69w== X-Gm-Message-State: AOAM533j4vXO3/MZgquzLpno78tgiPn6bnYEhYATAJ5jCLUjHyyzA8iJ Jp8bTa7NIJKSrWEaJ4SveoDrWjh6pkg= X-Google-Smtp-Source: ABdhPJyPFVUCG5xCnFCk+7y8YmRplQzUH4E2ozirPnV7rdSPke4lgztKZrfnX2J7IOa2opJ6j8xbug== X-Received: by 2002:a05:600c:510d:: with SMTP id o13mr22312499wms.104.1637523805294; Sun, 21 Nov 2021 11:43:25 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:df86:cebc:8870:2184]) by smtp.gmail.com with ESMTPSA id p19sm8024891wmq.4.2021.11.21.11.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Nov 2021 11:43:24 -0800 (PST) To: elfutils-devel@sourceware.org Subject: [PATCH v2] libebl: recognize FDO Packaging Metadata ELF note Date: Sun, 21 Nov 2021 19:43:18 +0000 Message-Id: <20211121194318.105654-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211119003127.466778-1-luca.boccassi@gmail.com> References: <20211119003127.466778-1-luca.boccassi@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: "luca.boccassi--- via Elfutils-devel" From: lilydjwg--- via Elfutils-devel Reply-To: luca.boccassi@gmail.com Cc: mark@klomp.org Errors-To: elfutils-devel-bounces+patchwork=sourceware.org@sourceware.org Sender: "Elfutils-devel" From: Luca Boccassi As defined on: https://systemd.io/COREDUMP_PACKAGE_METADATA/ this note will be used starting from Fedora 36. Allow readelf --notes to pretty print it: Note section [ 3] '.note.package' of 76 bytes at offset 0x2e8: Owner Data size Type FDO 57 FDO_PACKAGING_METADATA Packaging Metadata: {"type":"deb","name":"fsverity-utils","version":"1.3-1"} Signed-off-by: Luca Boccassi --- v2: check that note payload is NULL terminated libebl/eblobjnote.c | 3 +++ libebl/eblobjnotetypename.c | 3 +++ libelf/elf.h | 3 +++ 3 files changed, 9 insertions(+) diff --git a/libebl/eblobjnote.c b/libebl/eblobjnote.c index 36efe275..e3ad1409 100644 --- a/libebl/eblobjnote.c +++ b/libebl/eblobjnote.c @@ -288,6 +288,9 @@ ebl_object_note (Ebl *ebl, uint32_t namesz, const char *name, uint32_t type, if (descsz == 0 && type == NT_VERSION) return; + if (strcmp ("FDO", name) == 0 && type == FDO_PACKAGING_METADATA && descsz > 0 && desc[descsz - 1] == '\0') + printf(" Packaging Metadata: %.*s\n", (int) descsz, desc); + /* Everything else should have the "GNU" owner name. */ if (strcmp ("GNU", name) != 0) return; diff --git a/libebl/eblobjnotetypename.c b/libebl/eblobjnotetypename.c index 4662906d..863f20e4 100644 --- a/libebl/eblobjnotetypename.c +++ b/libebl/eblobjnotetypename.c @@ -101,6 +101,9 @@ ebl_object_note_type_name (Ebl *ebl, const char *name, uint32_t type, return buf; } + if (strcmp (name, "FDO") == 0 && type == FDO_PACKAGING_METADATA) + return "FDO_PACKAGING_METADATA"; + if (strcmp (name, "GNU") != 0) { /* NT_VERSION is special, all data is in the name. */ diff --git a/libelf/elf.h b/libelf/elf.h index 8e3e618f..633f9f67 100644 --- a/libelf/elf.h +++ b/libelf/elf.h @@ -1297,6 +1297,9 @@ typedef struct /* Program property. */ #define NT_GNU_PROPERTY_TYPE_0 5 +/* Packaging metadata as defined on https://systemd.io/COREDUMP_PACKAGE_METADATA/ */ +#define FDO_PACKAGING_METADATA 0xcafe1a7e + /* Note section name of program property. */ #define NOTE_GNU_PROPERTY_SECTION_NAME ".note.gnu.property"