shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-03 01:17:45 +03:00
Code

boot: Fix assertion failure

Browse Source 
The TPM code expects a description unless the PCR index indicates that
no measurements have to take place. The assert was preempting this
check from happening.

Fixes: #26428
(cherry picked from commit f92428eae5)
(cherry picked from commit cd5de2811a)
This commit is contained in:
Jan Janssen 2023-02-16 15:24:44 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent 7c9b9c8d93
commit ac3d8922df
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/boot/efi/measure.c
View File

@ -146,7 +146,7 @@ EFI_STATUS tpm_log_event(uint32_t pcrindex, EFI_PHYSICAL_ADDRESS buffer, UINTN b
EFI_TCG2 *tpm2; EFI_TCG2 *tpm2;
EFI_STATUS err; EFI_STATUS err;
assert(description); assert(description || pcrindex == UINT32_MAX);
/* If EFI_SUCCESS is returned, will initialize ret_measured to true if we actually measured /* If EFI_SUCCESS is returned, will initialize ret_measured to true if we actually measured
* something, or false if measurement was turned off. */ * something, or false if measurement was turned off. */