50 lines
2.1 KiB
Diff
50 lines
2.1 KiB
Diff
From ea0ff5cd4efb1d67820572fb0d7d1d8da0fc1dc1 Mon Sep 17 00:00:00 2001
|
|
From: Harald Hoyer <harald@hoyer.xyz>
|
|
Date: Fri, 28 Jul 2017 09:46:05 +0200
|
|
Subject: [PATCH] boot/efi: don't hard fail on error for tpm measure (#6473)
|
|
|
|
Display the error for a small amount of time, but don't fail hard.
|
|
|
|
In case of a faulty BIOS, a TPM error should not prevent the boot.
|
|
If something cares about the PCM measurement, it will be noticed
|
|
anyway later on.
|
|
|
|
Especially important now, that TPM measurement is the default now on
|
|
some distribution builds.
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1411156
|
|
(cherry picked from commit 522aa9f5f8755d7389131da41bd60b6276917ff2)
|
|
---
|
|
src/boot/efi/boot.c | 3 +--
|
|
src/boot/efi/stub.c | 3 +--
|
|
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
|
|
index 1e990b3825..316e95a72b 100644
|
|
--- a/src/boot/efi/boot.c
|
|
+++ b/src/boot/efi/boot.c
|
|
@@ -1657,8 +1657,7 @@ static EFI_STATUS image_start(EFI_HANDLE parent_image, const Config *config, con
|
|
loaded_image->LoadOptionsSize, loaded_image->LoadOptions);
|
|
if (EFI_ERROR(err)) {
|
|
Print(L"Unable to add image options measurement: %r", err);
|
|
- uefi_call_wrapper(BS->Stall, 1, 3 * 1000 * 1000);
|
|
- return err;
|
|
+ uefi_call_wrapper(BS->Stall, 1, 200 * 1000);
|
|
}
|
|
#endif
|
|
}
|
|
diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c
|
|
index bab5d46de9..2562228090 100644
|
|
--- a/src/boot/efi/stub.c
|
|
+++ b/src/boot/efi/stub.c
|
|
@@ -94,8 +94,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
|
|
loaded_image->LoadOptionsSize, loaded_image->LoadOptions);
|
|
if (EFI_ERROR(err)) {
|
|
Print(L"Unable to add image options measurement: %r", err);
|
|
- uefi_call_wrapper(BS->Stall, 1, 3 * 1000 * 1000);
|
|
- return err;
|
|
+ uefi_call_wrapper(BS->Stall, 1, 200 * 1000);
|
|
}
|
|
#endif
|
|
}
|