From 809cb1b4d803044c0129a9524e1b08ce681aab3f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 10 Mar 2026 08:10:06 +0100 Subject: [PATCH 1/3] pcrlock: add an extra assert() --- src/pcrextend/pcrextend.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pcrextend/pcrextend.c b/src/pcrextend/pcrextend.c index c80bf376fd..c319ddd0f8 100644 --- a/src/pcrextend/pcrextend.c +++ b/src/pcrextend/pcrextend.c @@ -327,6 +327,8 @@ static int extend_nvpcr_now( _cleanup_(tpm2_context_unrefp) Tpm2Context *c = NULL; int r; + assert(name); + r = tpm2_context_new_or_warn(arg_tpm2_device, &c); if (r < 0) return r; From 2fb2428296b44b72df50b8c7bce0371bce4b0f4c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 10 Mar 2026 11:54:54 +0100 Subject: [PATCH 2/3] pcrlock: do not pass wrong error to log message --- src/pcrlock/pcrlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pcrlock/pcrlock.c b/src/pcrlock/pcrlock.c index ab97c1a754..acf68d698b 100644 --- a/src/pcrlock/pcrlock.c +++ b/src/pcrlock/pcrlock.c @@ -1713,7 +1713,7 @@ static int event_log_add_component_file(EventLog *el, EventLogComponent *compone } if (!sd_json_variant_is_object(j)) { - log_warning_errno(r, "Component file %s does not contain JSON object, ignoring.", path); + log_warning("Component file %s does not contain JSON object, ignoring.", path); return 0; } From 0306b2c20ec5f59fc8aa7da2911353a42078b623 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 10 Mar 2026 11:54:17 +0100 Subject: [PATCH 3/3] pcrlock: add .pcrlock file for recently added NvPCR separator Follow-up for: 867e64737a1761e313c371abfb43ab2c04b9e568 --- src/pcrlock/meson.build | 1 + src/pcrlock/pcrlock.d/770-nvpcr-separator.pcrlock | 1 + 2 files changed, 2 insertions(+) create mode 100644 src/pcrlock/pcrlock.d/770-nvpcr-separator.pcrlock diff --git a/src/pcrlock/meson.build b/src/pcrlock/meson.build index 6533ef3ab8..f7fa3d18d9 100644 --- a/src/pcrlock/meson.build +++ b/src/pcrlock/meson.build @@ -27,6 +27,7 @@ install_data('pcrlock.d/500-separator.pcrlock.d/600-0xffffffff.pcrlock', install install_data('pcrlock.d/700-action-efi-exit-boot-services.pcrlock.d/300-present.pcrlock', install_dir : pcrlockdir / '700-action-efi-exit-boot-services.pcrlock.d') install_data('pcrlock.d/700-action-efi-exit-boot-services.pcrlock.d/600-absent.pcrlock', install_dir : pcrlockdir / '700-action-efi-exit-boot-services.pcrlock.d') install_data('pcrlock.d/750-enter-initrd.pcrlock', install_dir : pcrlockdir) +install_data('pcrlock.d/770-nvpcr-separator.pcrlock', install_dir : pcrlockdir) install_data('pcrlock.d/800-leave-initrd.pcrlock', install_dir : pcrlockdir) install_data('pcrlock.d/850-sysinit.pcrlock', install_dir : pcrlockdir) install_data('pcrlock.d/900-ready.pcrlock', install_dir : pcrlockdir) diff --git a/src/pcrlock/pcrlock.d/770-nvpcr-separator.pcrlock b/src/pcrlock/pcrlock.d/770-nvpcr-separator.pcrlock new file mode 100644 index 0000000000..2cca29b550 --- /dev/null +++ b/src/pcrlock/pcrlock.d/770-nvpcr-separator.pcrlock @@ -0,0 +1 @@ +{"records":[{"pcr":9,"digests":[{"hashAlg":"sha512","digest":"25d91b8f45d61cab950206c6edd86bd46ecbb1f2369bc1cdc7a8956861b4a0e30792e8b327548a7b31d5013088200f061970a8843dbb2504e400b80d46202642"},{"hashAlg":"sha384","digest":"196288284fffef2010ebff9d05ccc0b527fe0dcfd950c0524cbf36ed039aeecc25c8628abd1511ae77da685b7b5e17b4"},{"hashAlg":"sha256","digest":"97c5f96d4cd3fb14c7e272c47762af208f712c1a47733567e5c233e2b6f6c5cb"},{"hashAlg":"sha1","digest":"9cfca2696175a850a1ed68a6a1f075b38beab7cf"}]}]}