[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 4/9] cryptodisk: Improve error messaging in cryptomount invoca
From: |
Glenn Washburn |
Subject: |
[PATCH v5 4/9] cryptodisk: Improve error messaging in cryptomount invocations |
Date: |
Thu, 9 Dec 2021 11:14:53 -0600 |
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>
---
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 27491871a..f71bc62eb 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.27.0
- [PATCH v5 0/9] Refactor/improve cryptomount data passing to crypto modules, Glenn Washburn, 2021/12/09
- [PATCH v5 1/9] luks2: Add debug message to align with luks and geli modules, Glenn Washburn, 2021/12/09
- [PATCH v5 2/9] cryptodisk: Refactor to discard have_it global, Glenn Washburn, 2021/12/09
- [PATCH v5 4/9] cryptodisk: Improve error messaging in cryptomount invocations,
Glenn Washburn <=
- [PATCH v5 3/9] cryptodisk: Return failure in cryptomount when no cryptodisk modules are loaded, Glenn Washburn, 2021/12/09
- [PATCH v5 5/9] cryptodisk: Improve cryptomount -u error message, Glenn Washburn, 2021/12/09
- [PATCH v5 7/9] cryptodisk: Refactor password input out of crypto dev modules into cryptodisk, Glenn Washburn, 2021/12/09
- [PATCH v5 6/9] cryptodisk: Add infrastructure to pass data from cryptomount to cryptodisk modules, Glenn Washburn, 2021/12/09
- [PATCH v5 8/9] cryptodisk: Move global variables into grub_cryptomount_args struct, Glenn Washburn, 2021/12/09