[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v11 16/20] cryptodisk: Fallback to passphrase
From: |
Gary Lin |
Subject: |
[PATCH v11 16/20] cryptodisk: Fallback to passphrase |
Date: |
Fri, 12 Apr 2024 16:39:56 +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>
---
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 0ca1a5c4d..0dbf601c4 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 v11 13/20] util/grub-protect: Add new tool, (continued)
- [PATCH v11 18/20] diskfilter: look up cryptodisk devices first, Gary Lin, 2024/04/12
- [PATCH v11 20/20] tests: Add tpm2_test, Gary Lin, 2024/04/12
- [PATCH v11 19/20] tpm2: Enable tpm2 module for grub-emu, Gary Lin, 2024/04/12
- [PATCH v11 10/20] tpm2: Add TPM Software Stack (TSS), Gary Lin, 2024/04/12
- [PATCH v11 16/20] cryptodisk: Fallback to passphrase,
Gary Lin <=
- [PATCH v11 15/20] tpm2: Implement NV index, Gary Lin, 2024/04/12
- [PATCH v11 17/20] cryptodisk: wipe out the cached keys from protectors, Gary Lin, 2024/04/12
- [PATCH v11 12/20] cryptodisk: Support key protectors, Gary Lin, 2024/04/12
- Re: [PATCH v11 00/20] Automatic Disk Unlock with TPM2, Stefan Berger, 2024/04/12