14793c1f96
- Add tpm, tpm2, luks2 and gcry_sha512 to default grub.efi (bsc#1197625) - Make grub-tpm.efi a symlink to grub.efi * grub2.spec - Log error when tpm event log is full and continue * 0001-tpm-Log-EFI_VOLUME_FULL-and-continue.patch - Patch superseded * 0001-tpm-Pass-unknown-error-as-non-fatal-but-debug-print-.patch - Add patches for automatic TPM disk unlock (jsc#SLE-24018) (bsc#1196668) * 0001-luks2-Add-debug-message-to-align-with-luks-and-geli-.patch * 0002-cryptodisk-Refactor-to-discard-have_it-global.patch * 0003-cryptodisk-Return-failure-in-cryptomount-when-no-cry.patch * 0004-cryptodisk-Improve-error-messaging-in-cryptomount-in.patch * 0005-cryptodisk-Improve-cryptomount-u-error-message.patch * 0006-cryptodisk-Add-infrastructure-to-pass-data-from-cryp.patch * 0007-cryptodisk-Refactor-password-input-out-of-crypto-dev.patch * 0008-cryptodisk-Move-global-variables-into-grub_cryptomou.patch * 0009-cryptodisk-Improve-handling-of-partition-name-in-cry.patch * 0010-protectors-Add-key-protectors-framework.patch * 0011-tpm2-Add-TPM-Software-Stack-TSS.patch * 0012-protectors-Add-TPM2-Key-Protector.patch * 0013-cryptodisk-Support-key-protectors.patch * 0014-util-grub-protect-Add-new-tool.patch - Fix no disk unlocking happen (bsc#1196668) * 0001-crytodisk-fix-cryptodisk-module-looking-up.patch - Fix build error * fix-tpm2-build.patch OBS-URL: https://build.opensuse.org/request/show/992180 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=417
59 lines
1.9 KiB
Diff
59 lines
1.9 KiB
Diff
From f41488d0e361a34f4d3f8fb6c92729a2901a5c76 Mon Sep 17 00:00:00 2001
|
|
From: Glenn Washburn <development@efficientek.com>
|
|
Date: Thu, 9 Dec 2021 11:14:53 -0600
|
|
Subject: [PATCH 04/14] cryptodisk: Improve error messaging in cryptomount
|
|
invocations
|
|
|
|
Update such that "cryptomount -u UUID" will not print two error messages
|
|
when an invalid passphrase is given and the most relevant error message
|
|
will be displayed.
|
|
|
|
Signed-off-by: Glenn Washburn <development@efficientek.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/disk/cryptodisk.c | 21 +++++++++++++++++----
|
|
1 file changed, 17 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
|
|
index 27491871a5..3a896c6634 100644
|
|
--- a/grub-core/disk/cryptodisk.c
|
|
+++ b/grub-core/disk/cryptodisk.c
|
|
@@ -1109,7 +1109,10 @@ grub_cryptodisk_scan_device (const char *name,
|
|
if (grub_errno == GRUB_ERR_BAD_MODULE)
|
|
grub_error_pop ();
|
|
|
|
- if (grub_errno != GRUB_ERR_NONE)
|
|
+ if (search_uuid != NULL)
|
|
+ /* Push error onto stack to save for cryptomount. */
|
|
+ grub_error_push ();
|
|
+ else
|
|
grub_print_error ();
|
|
|
|
cleanup:
|
|
@@ -1146,9 +1149,19 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args)
|
|
found_uuid = grub_device_iterate (&grub_cryptodisk_scan_device, NULL);
|
|
search_uuid = NULL;
|
|
|
|
- if (!found_uuid)
|
|
- return grub_error (GRUB_ERR_BAD_ARGUMENT, "no such cryptodisk found");
|
|
- return GRUB_ERR_NONE;
|
|
+ if (found_uuid)
|
|
+ return GRUB_ERR_NONE;
|
|
+ else if (grub_errno == GRUB_ERR_NONE)
|
|
+ {
|
|
+ /*
|
|
+ * Try to pop the next error on the stack. If there is not one, then
|
|
+ * no device matched the given UUID.
|
|
+ */
|
|
+ grub_error_pop ();
|
|
+ if (grub_errno == GRUB_ERR_NONE)
|
|
+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "no such cryptodisk found");
|
|
+ }
|
|
+ return grub_errno;
|
|
}
|
|
else if (state[1].set || (argc == 0 && state[2].set))
|
|
{
|
|
--
|
|
2.34.1
|
|
|