748378a3ec
Removed patches: - 0007-Fix-hwdb-paths.patch The directory we want seems to already be included in the list. Is there a reason why we want to restrict it further? - 0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch This patch has little to do with how the meson.build file looks now. The new patch 0017 is the successor to this one. - 0015-pkg-config-derive-prefix-from-prefix.patch This is fixed upstream. We don't need this anymore.
42 lines
1.9 KiB
Diff
42 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Nick Cao <nickcao@nichi.co>
|
|
Date: Sun, 15 Jan 2023 20:15:55 +0800
|
|
Subject: [PATCH] tpm2_context_init: fix driver name checking
|
|
|
|
https://github.com/systemd/systemd/commit/542dbc623e introduced
|
|
additional checks for tpm2 driver names, namely ensuring the driver
|
|
name, when concated with "libtss2-tcti-" and ".so.0", generates a valid
|
|
filename (with no '/' inside).
|
|
|
|
For example, if the driver is name "device", the line
|
|
fn = strjoina("libtss2-tcti-", driver, ".so.0")
|
|
would yield "libtss2-tcti-device.so.0", passing the check. And the
|
|
filename is then passed to dlopen for loading the driver.
|
|
|
|
Our current approach for systemd to correctly locate these dynamically
|
|
loaded libraries is to patch the filenames to include their absolute
|
|
path. Thus the line mentioned above is patched into
|
|
fn = strjoina("/nix/store/xxxxxxx-tpm2-tss-3.2.0/lib/libtss2-tcti-", driver, ".so.0")
|
|
yielding "/nix/store/xxxxxxx-tpm2-tss-3.2.0/lib/libtss2-tcti-device.so.0",
|
|
tripping the check.
|
|
|
|
This patch relaxes the check to also accept absolute paths, by replacing
|
|
filename_is_valid with path_is_valid.
|
|
---
|
|
src/shared/tpm2-util.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
|
|
index 5e07b88a89..8dd7315009 100644
|
|
--- a/src/shared/tpm2-util.c
|
|
+++ b/src/shared/tpm2-util.c
|
|
@@ -654,7 +654,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {
|
|
fn = strjoina("libtss2-tcti-", driver, ".so.0");
|
|
|
|
/* Better safe than sorry, let's refuse strings that cannot possibly be valid driver early, before going to disk. */
|
|
- if (!filename_is_valid(fn))
|
|
+ if (!path_is_valid(fn))
|
|
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "TPM2 driver name '%s' not valid, refusing.", driver);
|
|
|
|
context->tcti_dl = dlopen(fn, RTLD_NOW);
|