diff options
| author | Tom Rini <trini@konsulko.com> | 2021-12-20 17:12:04 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-20 17:12:04 -0500 |
| commit | 4afab30caea3211032710c4298a8839d3254e7f7 (patch) | |
| tree | 8318afb8810966aca9fe356dde316c155b7a33ce /lib/efi_loader/efi_boottime.c | |
| parent | e9d7888da845638f135046d53c25492a8c54e664 (diff) | |
| parent | 734ad933766f0dbbeafe1b27211686940a5e6d16 (diff) | |
Merge tag 'v2022.01-rc4' into next
Prepare v2022.01-rc4
Diffstat (limited to 'lib/efi_loader/efi_boottime.c')
| -rw-r--r-- | lib/efi_loader/efi_boottime.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 8492b732f3..20b69699fe 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -3016,9 +3016,12 @@ efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle, if (IS_ENABLED(CONFIG_EFI_TCG2_PROTOCOL)) { if (image_obj->image_type == IMAGE_SUBSYSTEM_EFI_APPLICATION) { ret = efi_tcg2_measure_efi_app_invocation(image_obj); - if (ret != EFI_SUCCESS) { - log_warning("tcg2 measurement fails(0x%lx)\n", - ret); + if (ret == EFI_SECURITY_VIOLATION) { + /* + * TCG2 Protocol is installed but no TPM device found, + * this is not expected. + */ + return EFI_EXIT(EFI_SECURITY_VIOLATION); } } } |