dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

tpm2: use GREEDY_REALLOC_APPEND() in tpm2_get_capability_handles(), cap max value

Browse Source 
Simplify the function with GREEDY_REALLOC_APPEND(). Also limit the size_t-sized
max value to UINT32_MAX since that's the maximum of the range this searches,
and the max parameter for tpm2_get_capability() is uint32_t.
This commit is contained in:
Dan Streetman
2023-09-08 14:22:11 -04:00
parent 171d5b69c0
commit 7014006906
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/shared/tpm2-util.c
View File

@@ -402,6 +402,8 @@ static int tpm2_get_capability_handles(
assert(ret_handles);
assert(ret_n_handles);
max = MIN(max, UINT32_MAX);
while (max > 0) {
TPMU_CAPABILITIES capability;
r = tpm2_get_capability(c, TPM2_CAP_HANDLES, current, (uint32_t) max, &capability);
@@ -417,13 +419,10 @@ static int tpm2_get_capability_handles(
if (n_handles > SIZE_MAX - handle_list.count)
return log_oom_debug();
if (!GREEDY_REALLOC(handles, n_handles + handle_list.count))
if (!GREEDY_REALLOC_APPEND(handles, n_handles, handle_list.handle, handle_list.count))
return log_oom_debug();
memcpy_safe(&handles[n_handles], handle_list.handle, sizeof(handles[0]) * handle_list.count);
max -= handle_list.count;
n_handles += handle_list.count;
/* Update current to the handle index after the last handle in the list. */
current = handles[n_handles - 1] + 1;