6eaa34fe07
- Resolves: CVE-2024-45779 CVE-2024-45778 CVE-2025-1118 - Resolves: CVE-2025-0677 CVE-2024-45782 CVE-2025-0690 - Resolves: CVE-2024-45783 CVE-2025-0624 CVE-2024-45776 - Resolves: CVE-2025-0622 CVE-2024-45774 CVE-2024-45775 - Resolves: CVE-2024-45781 CVE-2024-45780 - Resolves: #RHEL-79700 - Resolves: #RHEL-79341 - Resolves: #RHEL-79875 - Resolves: #RHEL-79849 - Resolves: #RHEL-79707 - Resolves: #RHEL-79857 - Resolves: #RHEL-79709 - Resolves: #RHEL-79846 - Resolves: #RHEL-75737 - Resolves: #RHEL-79713 - Resolves: #RHEL-73785 - Resolves: #RHEL-73787 - Resolves: #RHEL-79704 - Resolves: #RHEL-79702 Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Glenn Washburn <development@efficientek.com>
|
|
Date: Thu, 9 Dec 2021 11:14:58 -0600
|
|
Subject: [PATCH] cryptodisk: Improve handling of partition name in cryptomount
|
|
password prompt
|
|
|
|
Call grub_partition_get_name() unconditionally to initialize the part
|
|
variable. Then part will only be NULL when grub_partition_get_name() errors.
|
|
Note that when source->partition is NULL, then grub_partition_get_name()
|
|
returns an allocated empty string. So no comma or partition will be printed,
|
|
as desired.
|
|
|
|
Signed-off-by: Glenn Washburn <development@efficientek.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/disk/cryptodisk.c | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
|
|
index 7ca8804..4970973 100644
|
|
--- a/grub-core/disk/cryptodisk.c
|
|
+++ b/grub-core/disk/cryptodisk.c
|
|
@@ -1021,11 +1021,10 @@ grub_cryptodisk_scan_device_real (const char *name,
|
|
{
|
|
/* Get the passphrase from the user, if no key data. */
|
|
askpass = 1;
|
|
- if (source->partition != NULL)
|
|
- part = grub_partition_get_name (source->partition);
|
|
+ part = grub_partition_get_name (source->partition);
|
|
grub_printf_ (N_("Enter passphrase for %s%s%s (%s): "), source->name,
|
|
source->partition != NULL ? "," : "",
|
|
- part != NULL ? part : "",
|
|
+ part != NULL ? part : N_("UNKNOWN"),
|
|
dev->uuid);
|
|
grub_free (part);
|
|
|