From c7da9e9a65aaeb7146674c86fbd4153cd5195c55 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 20 Nov 2023 14:26:18 +0100
Subject: [PATCH] pcrlock: check for embedded NUL bytes

---
 src/pcrlock/pcrlock.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pcrlock/pcrlock.c b/src/pcrlock/pcrlock.c
index 9978ffe..dc48bc5 100644
--- a/src/pcrlock/pcrlock.c
+++ b/src/pcrlock/pcrlock.c
@@ -1125,6 +1125,11 @@ static int event_log_load_userspace(EventLog *el) {
 
                 b[bn] = 0; /* Turn it into a string */
 
+                if (memchr(b, 0, bn)) {
+                        log_warning("Found record with embedded NUL byte, skipping.");
+                        continue;
+                }
+
                 r = json_parse(b, 0, &j, NULL, NULL);
                 if (r < 0)
                         return log_error_errno(r, "Failed to parse local TPM measurement log file: %m");
-- 
2.7.4