[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v13 16/20] cryptodisk: Fallback to passphrase
From: |
Gary Lin |
Subject: |
[PATCH v13 16/20] cryptodisk: Fallback to passphrase |
Date: |
Thu, 25 Apr 2024 16:02:02 +0800 |
From: Patrick Colp <patrick.colp@oracle.com>
If a protector is specified, but it fails to unlock the disk, fall back
to asking for the passphrase. However, an error was set indicating that
the protector(s) failed. Later code (e.g., LUKS code) fails as
`grub_errno` is now set. Print the existing errors out first, before
proceeding with the passphrase.
Signed-off-by: Patrick Colp <patrick.colp@oracle.com>
Signed-off-by: Gary Lin <glin@suse.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
---
grub-core/disk/cryptodisk.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
index b7648ffb7..8f00f22a8 100644
--- a/grub-core/disk/cryptodisk.c
+++ b/grub-core/disk/cryptodisk.c
@@ -1191,11 +1191,16 @@ grub_cryptodisk_scan_device_real (const char *name,
source->name, source->partition != NULL ? "," : "",
part != NULL ? part : N_("UNKNOWN"), dev->uuid);
grub_free (part);
- goto error;
}
if (!cargs->key_len)
{
+ if (grub_errno)
+ {
+ grub_print_error ();
+ grub_errno = GRUB_ERR_NONE;
+ }
+
/* Get the passphrase from the user, if no key data. */
askpass = 1;
part = grub_partition_get_name (source->partition);
--
2.35.3
- Re: [PATCH v13 08/20] libtasn1: Add the documentation, (continued)
- [PATCH v13 10/20] tpm2: Add TPM Software Stack (TSS), Gary Lin, 2024/04/25
- [PATCH v13 12/20] cryptodisk: Support key protectors, Gary Lin, 2024/04/25
- [PATCH v13 13/20] util/grub-protect: Add new tool, Gary Lin, 2024/04/25
- [PATCH v13 17/20] cryptodisk: wipe out the cached keys from protectors, Gary Lin, 2024/04/25
- [PATCH v13 11/20] key_protector: Add TPM2 Key Protector, Gary Lin, 2024/04/25
- [PATCH v13 09/20] key_protector: Add key protectors framework, Gary Lin, 2024/04/25
- [PATCH v13 07/20] asn1_test: test module for libtasn1, Gary Lin, 2024/04/25
- [PATCH v13 14/20] tpm2: Support authorized policy, Gary Lin, 2024/04/25
- [PATCH v13 15/20] tpm2: Implement NV index, Gary Lin, 2024/04/25
- [PATCH v13 16/20] cryptodisk: Fallback to passphrase,
Gary Lin <=
- [PATCH v13 18/20] diskfilter: look up cryptodisk devices first, Gary Lin, 2024/04/25
- [PATCH v13 19/20] tpm2: Enable tpm2 module for grub-emu, Gary Lin, 2024/04/25
- [PATCH v13 20/20] tests: Add tpm2_test, Gary Lin, 2024/04/25