]> git.proxmox.com Git - efi-boot-shim.git/commitdiff
shim/tpm: fix trigger failure caused by NULL arguments
authorLans Zhang <jia.zhang@windriver.com>
Wed, 16 Nov 2016 07:28:08 +0000 (15:28 +0800)
committerPeter Jones <pjones@redhat.com>
Wed, 30 Nov 2016 17:56:55 +0000 (12:56 -0500)
Certain AMI BIOS (Intel NUC5i3MYBE BIOS version 0037) may make the strict
check on the last 3 arguments passed to get_event_log() and don't expect
NULL pointers are passed. In order to work around this failure
(EFI_INVALID_PARAMETER), pass them even though we really don't use it.

Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
tpm.c

diff --git a/tpm.c b/tpm.c
index 9b5a8991adcb0474e463b23eb4a3d7e572a8aa5a..4395821d1215f7279d4fea06736f6576fc4611c3 100644 (file)
--- a/tpm.c
+++ b/tpm.c
@@ -71,9 +71,13 @@ static BOOLEAN tpm2_present(efi_tpm2_protocol_t *tpm)
  */
 static EFI_STATUS trigger_tcg2_final_events_table(efi_tpm2_protocol_t *tpm2)
 {
+       EFI_PHYSICAL_ADDRESS start;
+       EFI_PHYSICAL_ADDRESS end;
+       BOOLEAN truncated;
+
        return uefi_call_wrapper(tpm2->get_event_log, 5, tpm2,
-                                EFI_TCG2_EVENT_LOG_FORMAT_TCG_2, NULL,
-                                NULL, NULL);
+                                EFI_TCG2_EVENT_LOG_FORMAT_TCG_2, &start,
+                                &end, &truncated);
 }
 
 EFI_STATUS tpm_log_event(EFI_PHYSICAL_ADDRESS buf, UINTN size, UINT8 pcr,