SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tpm2-util: gracefully skip deserialization when no input

Browse Source 
While at it, this also makes tpm2_deserialize() take struct iovec.

Fixes #38507.
This commit is contained in:
Yu Watanabe
2025-08-12 06:11:34 +09:00
parent 5bd2538405
commit 8d40f3f42e
3 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pcrlock/pcrlock.c
+17 -23
View File
@@ -4529,15 +4529,13 @@ static int make_policy(bool force, RecoveryPinMode recovery_pin_mode) {
_cleanup_(tpm2_handle_freep) Tpm2Handle *srk_handle = NULL;
if (iovec_is_set(&srk_blob)) {
r = tpm2_deserialize(
tc,
srk_blob.iov_base,
srk_blob.iov_len,
&srk_handle);
if (r < 0)
return log_error_errno(r, "Failed to deserialize SRK TR: %m");
} else {
r = tpm2_deserialize(
tc,
&srk_blob,
&srk_handle);
if (r < 0)
return log_error_errno(r, "Failed to deserialize SRK TR: %m");
if (r == 0) {
r = tpm2_get_or_create_srk(
tc,
/* session= */ NULL,
@@ -4606,13 +4604,11 @@ static int make_policy(bool force, RecoveryPinMode recovery_pin_mode) {
_cleanup_(tpm2_handle_freep) Tpm2Handle *nv_handle = NULL;
TPM2_HANDLE nv_index = 0;
if (iovec_is_set(&nv_blob)) {
r = tpm2_deserialize(tc, nv_blob.iov_base, nv_blob.iov_len, &nv_handle);
if (r < 0)
return log_error_errno(r, "Failed to deserialize NV index TR: %m");
r = tpm2_deserialize(tc, &nv_blob, &nv_handle);
if (r < 0)
return log_error_errno(r, "Failed to deserialize NV index TR: %m");
if (r > 0)
nv_index = old_policy.nv_index;
}
TPM2B_AUTH auth = {};
CLEANUP_ERASE(auth);
@@ -4881,20 +4877,18 @@ static int undefine_policy_nv_index(
_cleanup_(tpm2_handle_freep) Tpm2Handle *srk_handle = NULL;
r = tpm2_deserialize(
tc,
srk_blob->iov_base,
srk_blob->iov_len,
srk_blob,
&srk_handle);
if (r < 0)
return log_error_errno(r, "Failed to deserialize SRK TR: %m");
if (r < 0)
return log_error_errno(r, "Failed to deserialize SRK TR: %m");
_cleanup_(tpm2_handle_freep) Tpm2Handle *nv_handle = NULL;
r = tpm2_deserialize(
tc,
nv_blob->iov_base,
nv_blob->iov_len,
nv_blob,
&nv_handle);
if (r < 0)
return log_error_errno(r, "Failed to deserialize NV TR: %m");
if (r < 0)
return log_error_errno(r, "Failed to deserialize NV TR: %m");
_cleanup_(tpm2_handle_freep) Tpm2Handle *encryption_session = NULL;
r = tpm2_make_encryption_session(