Skip to content

Backport a bugfix to v0.10.3 #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stefanberger merged 2 commits into from
Mar 5, 2026
Merged

Backport a bugfix to v0.10.3 #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a36a3f
build-sys: Build libtpms v0.10.3
stefanberger Mar 5, 2026
ac4fe57
tpm2: Limit array_size to current size of array (ppList/auditCommands…
stefanberger Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# See the LICENSE file for the license associated with this file.

AC_INIT([libtpms],[0.10.2])
AC_INIT([libtpms],[0.10.3])
AC_PREREQ([2.69])
AC_CONFIG_SRCDIR(Makefile.am)
AC_CONFIG_AUX_DIR([.])
Expand Down
2 changes: 1 addition & 1 deletion dist/libtpms.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# --- libtpm rpm-spec ---

%define name libtpms
%define version 0.10.2
%define version 0.10.3
%define release 0~dev1

# Valid crypto subsystems are 'freebl' and 'openssl'
Expand Down
2 changes: 1 addition & 1 deletion include/libtpms/tpm_library.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ extern "C" {

#define TPM_LIBRARY_VER_MAJOR 0
#define TPM_LIBRARY_VER_MINOR 10
#define TPM_LIBRARY_VER_MICRO 2
#define TPM_LIBRARY_VER_MICRO 3

#define TPM_LIBRARY_VERSION_GEN(MAJ, MIN, MICRO) \
(( MAJ << 16 ) | ( MIN << 8 ) | ( MICRO ))
Expand Down
10 changes: 8 additions & 2 deletions src/tpm2/NVMarshal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4157,8 +4157,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);
}
}
Expand Down Expand Up @@ -4220,8 +4223,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);
}
}
Expand Down