All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] tpm: Pass unknown error as non-fatal, but debug print the error we got
@ 2019-10-25 14:27 Mathieu Trudel-Lapierre
  2019-10-25 14:48 ` Mathieu Trudel-Lapierre
  0 siblings, 1 reply; 8+ messages in thread
From: Mathieu Trudel-Lapierre @ 2019-10-25 14:27 UTC (permalink / raw)
  To: grub-devel; +Cc: Mathieu Trudel-Lapierre

Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Patch-Name: ubuntu-tpm-unknown-error-non-fatal.patch
---
 grub-core/commands/efi/tpm.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/grub-core/commands/efi/tpm.c b/grub-core/commands/efi/tpm.c
index 32909c192..fdbaaee19 100644
--- a/grub-core/commands/efi/tpm.c
+++ b/grub-core/commands/efi/tpm.c
@@ -155,7 +155,8 @@ grub_tpm1_execute (grub_efi_handle_t tpm_handle,
     case GRUB_EFI_NOT_FOUND:
       return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("TPM unavailable"));
     default:
-      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("Unknown TPM error"));
+      grub_dprintf("tpm", "Unknown TPM error: %" PRIdGRUB_SSIZE, status);
+      return 0;
     }
 }
 
@@ -195,7 +196,8 @@ grub_tpm2_execute (grub_efi_handle_t tpm_handle,
     case GRUB_EFI_NOT_FOUND:
       return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("TPM unavailable"));
     default:
-      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("Unknown TPM error"));
+      grub_dprintf("tpm", "Unknown TPM error: %" PRIdGRUB_SSIZE, status);
+      return 0;
     }
 }
 
@@ -262,7 +264,8 @@ grub_tpm1_log_event (grub_efi_handle_t tpm_handle, unsigned char *buf,
     case GRUB_EFI_NOT_FOUND:
       return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("TPM unavailable"));
     default:
-      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("Unknown TPM error"));
+      grub_dprintf("tpm", "Unknown TPM error: %" PRIdGRUB_SSIZE, status);
+      return 0;
     }
 }
 
@@ -312,7 +315,8 @@ grub_tpm2_log_event (grub_efi_handle_t tpm_handle, unsigned char *buf,
     case GRUB_EFI_NOT_FOUND:
       return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("TPM unavailable"));
     default:
-      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("Unknown TPM error"));
+      grub_dprintf("tpm", "Unknown TPM error: %" PRIdGRUB_SSIZE, status);
+      return 0;
     }
 }
 
-- 
2.20.1



^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2019-11-06 14:04 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-25 14:27 [PATCH] tpm: Pass unknown error as non-fatal, but debug print the error we got Mathieu Trudel-Lapierre
2019-10-25 14:48 ` Mathieu Trudel-Lapierre
2019-10-25 17:36   ` Javier Martinez Canillas
2019-10-29 10:49     ` Max Tottenham
2019-10-29 12:12       ` Javier Martinez Canillas
2019-11-06 11:37         ` Daniel Kiper
2019-11-06 14:04           ` Max Tottenham
2019-10-28 16:53   ` Daniel Kiper

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.