Proxmox-Port/libtpms
1
0
Fork 0
mirror of https://github.com/stefanberger/libtpms synced 2026-08-07 03:15:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tpm2: Limit array_size to current size of array (ppList/auditCommands) (BUGFIX)

Browse Source 
The current libtpms v0.10.2 does not accept a TPM 2 state that was written
with a more recent version of libtpms if the sizes of ppList and/or
auditCommands increased. Remove the asserts that trigger state reading
failures and limit array_size to the sizeof(data->ppList) and
sizeof(data->auditCommands) respectively . More recent versions of libtpms,
if they support more TPM 2 commands, will extend these arrays but those new
commands will not be usable by older versions of libtpms (via profile and
StateFormatLevel) and can therefore be ignored by truncating those arrays.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2026-03-05 10:15:19 -05:00 committed by Stefan Berger
parent 801d8fbbaa
commit 747e279530
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tpm2/NVMarshal.c
View File

@ -4136,8 +4136,11 @@ PERSISTENT_DATA_PPList_Unmarshal(PERSISTENT_DATA *data, BYTE **buffer, INT32 *si
rc = ConvertFromCompressedBitArray(buf, array_size,
data->ppList, sizeof(data->ppList));
} else {
/* later versions of libtpms may write bigger arrays - truncate them */
if (array_size > sizeof(data->ppList))
array_size = sizeof(data->ppList);
memset(data->ppList, 0, sizeof(data->ppList));
assert(array_size <= sizeof(data->ppList));
memcpy(data->ppList, buf, array_size);
}
}
@ -4199,8 +4202,11 @@ PERSISTENT_DATA_AuditCommands_Unmarshal(PERSISTENT_DATA *data, BYTE **buffer, IN
rc = ConvertFromCompressedBitArray(buf, array_size,
data->auditCommands, sizeof(data->auditCommands));
} else {
/* later versions of libtpms may write bigger arrays - truncate them */
if (array_size > sizeof(data->auditCommands))
array_size = sizeof(data->auditCommands);
memset(data->auditCommands, 0, sizeof(data->auditCommands));
assert(array_size <= sizeof(data->auditCommands));
memcpy(data->auditCommands, buf, array_size);
}
}