33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 2a16be65ca89cf18adf63a99ae1b1748e63d6773 Mon Sep 17 00:00:00 2001
|
|
From: Li Tian <94442129+litian1992@users.noreply.github.com>
|
|
Date: Tue, 19 Aug 2025 05:43:41 +0800
|
|
Subject: [PATCH] ukify: rstrip and escape binary null characters from
|
|
'inspect' output (#38607)
|
|
|
|
SBAT section of UKI may contain \u000 null characters. Rstrip them, and if there's anything left in the middle,
|
|
escape them so they are displayed as text.
|
|
|
|
Fixes #38606
|
|
|
|
(cherry picked from commit 776991a3f349d9c99fd166a0c87fcd2bc1bf92a5)
|
|
Signed-off-by: Li Tian <litian@redhat.com>
|
|
|
|
Resolves: RHEL-109558
|
|
---
|
|
src/ukify/ukify.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py
|
|
index 08f505a271..2d5050eaca 100755
|
|
--- a/src/ukify/ukify.py
|
|
+++ b/src/ukify/ukify.py
|
|
@@ -986,7 +986,7 @@ def inspect_section(opts, section):
|
|
|
|
if ttype == 'text':
|
|
try:
|
|
- struct['text'] = data.decode()
|
|
+ struct['text'] = data.rstrip(b'\0').replace(b'\0', b'\\0').decode()
|
|
except UnicodeDecodeError as e:
|
|
print(f"Section {name!r} is not valid text: {e}")
|
|
struct['text'] = '(not valid UTF-8)'
|