projects
/
systemd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2d5ccb0
)
boot: Fix assertion failure
author
Jan Janssen
<medhefgo@web.de>
Thu, 16 Feb 2023 14:24:44 +0000
(15:24 +0100)
committer
Yu Watanabe
<watanabe.yu+github@gmail.com>
Thu, 16 Feb 2023 20:01:53 +0000
(
05:01
+0900)
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
src/boot/efi/measure.c
patch
|
blob
|
history
diff --git
a/src/boot/efi/measure.c
b/src/boot/efi/measure.c
index a8bbc62eaae080ebe9c5da56452ec2bf72396ea9..949e26350c783fc44490ee03e381647ea7e2e7cf 100644
(file)
--- a/
src/boot/efi/measure.c
+++ b/
src/boot/efi/measure.c
@@
-146,7
+146,7
@@
EFI_STATUS tpm_log_event(uint32_t pcrindex, EFI_PHYSICAL_ADDRESS buffer, size_t
EFI_TCG2 *tpm2;
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
* something, or false if measurement was turned off. */