Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-27 01:29:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

cryptodisk: Move global variables into grub_cryptomount_args struct

Browse Source 
Note that cargs.search_uuid does not need to be initialized in various parts
of the cryptomount argument parsing, just once when cargs is declared with
a struct initializer. The previous code used a global variable which would
retain the value across cryptomount invocations.

Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Glenn Washburn authored and Daniel Kiper committed 2021-12-23 02:31:44 +01:00
1 parent ba9fb5d721
commit ebdd82b00c
5 files changed
+28 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

grub-core/disk/cryptodisk.c
+9 -15
View File
@@ -984,9 +984,6 @@ grub_util_cryptodisk_get_uuid (grub_disk_t disk)
#endif #endif
static int check_boot;
static char *search_uuid;
static void static void
cryptodisk_close (grub_cryptodisk_t dev) cryptodisk_close (grub_cryptodisk_t dev)
{ {
@@ -1014,7 +1011,7 @@ grub_cryptodisk_scan_device_real (const char *name,
FOR_CRYPTODISK_DEVS (cr) FOR_CRYPTODISK_DEVS (cr)
{ {
dev = cr->scan (source, search_uuid, check_boot); dev = cr->scan (source, cargs);
if (grub_errno) if (grub_errno)
return NULL; return NULL;
if (!dev) if (!dev)
@@ -1077,6 +1074,7 @@ grub_cryptodisk_cheat_mount (const char *sourcedev, const char *cheat)
grub_cryptodisk_t dev; grub_cryptodisk_t dev;
grub_cryptodisk_dev_t cr; grub_cryptodisk_dev_t cr;
grub_disk_t source; grub_disk_t source;
struct grub_cryptomount_args cargs = {0};
/* Try to open disk. */ /* Try to open disk. */
source = grub_disk_open (sourcedev); source = grub_disk_open (sourcedev);
@@ -1093,7 +1091,7 @@ grub_cryptodisk_cheat_mount (const char *sourcedev, const char *cheat)
FOR_CRYPTODISK_DEVS (cr) FOR_CRYPTODISK_DEVS (cr)
{ {
dev = cr->scan (source, search_uuid, check_boot); dev = cr->scan (source, &cargs);
if (grub_errno) if (grub_errno)
return grub_errno; return grub_errno;
if (!dev) if (!dev)
@@ -1136,7 +1134,7 @@ grub_cryptodisk_scan_device (const char *name,
dev = grub_cryptodisk_scan_device_real (name, source, cargs); dev = grub_cryptodisk_scan_device_real (name, source, cargs);
if (dev) if (dev)
{ {
ret = (search_uuid != NULL && grub_strcasecmp (search_uuid, dev->uuid) == 0); ret = (cargs->search_uuid != NULL && grub_strcasecmp (cargs->search_uuid, dev->uuid) == 0);
goto cleanup; goto cleanup;
} }
@@ -1147,7 +1145,7 @@ grub_cryptodisk_scan_device (const char *name,
if (grub_errno == GRUB_ERR_BAD_MODULE) if (grub_errno == GRUB_ERR_BAD_MODULE)
grub_error_pop (); grub_error_pop ();
if (search_uuid != NULL) if (cargs->search_uuid != NULL)
/* Push error onto stack to save for cryptomount. */ /* Push error onto stack to save for cryptomount. */
grub_error_push (); grub_error_push ();
else else
@@ -1189,10 +1187,9 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args)
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
check_boot = state[2].set; cargs.check_boot = state[2].set;
search_uuid = args[0]; cargs.search_uuid = args[0];
found_uuid = grub_device_iterate (&grub_cryptodisk_scan_device, &cargs); found_uuid = grub_device_iterate (&grub_cryptodisk_scan_device, &cargs);
search_uuid = NULL;
if (found_uuid) if (found_uuid)
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
@@ -1210,10 +1207,8 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args)
} }
else if (state[1].set || (argc == 0 && state[2].set)) /* -a|-b */ else if (state[1].set || (argc == 0 && state[2].set)) /* -a|-b */
{ {
search_uuid = NULL; cargs.check_boot = state[2].set;
check_boot = state[2].set;
grub_device_iterate (&grub_cryptodisk_scan_device, &cargs); grub_device_iterate (&grub_cryptodisk_scan_device, &cargs);
search_uuid = NULL;
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
else else
@@ -1224,8 +1219,7 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args)
char *disklast = NULL; char *disklast = NULL;
grub_size_t len; grub_size_t len;
search_uuid = NULL; cargs.check_boot = state[2].set;
check_boot = state[2].set;
diskname = args[0]; diskname = args[0];
len = grub_strlen (diskname); len = grub_strlen (diskname);
if (len && diskname[0] == '(' && diskname[len - 1] == ')') if (len && diskname[0] == '(' && diskname[len - 1] == ')')
grub-core/disk/geli.c
+4 -5
View File
@@ -240,8 +240,7 @@ grub_util_get_geli_uuid (const char *dev)
#endif #endif
static grub_cryptodisk_t static grub_cryptodisk_t
configure_ciphers (grub_disk_t disk, const char *check_uuid, configure_ciphers (grub_disk_t disk, grub_cryptomount_args_t cargs)
int boot_only)
{ {
grub_cryptodisk_t newdev; grub_cryptodisk_t newdev;
struct grub_geli_phdr header; struct grub_geli_phdr header;
@@ -289,7 +288,7 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid,
return NULL; return NULL;
} }
if (boot_only && !(grub_le_to_cpu32 (header.flags) & GRUB_GELI_FLAGS_BOOT)) if (cargs->check_boot && !(grub_le_to_cpu32 (header.flags) & GRUB_GELI_FLAGS_BOOT))
{ {
grub_dprintf ("geli", "not a boot volume\n"); grub_dprintf ("geli", "not a boot volume\n");
return NULL; return NULL;
@@ -302,9 +301,9 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid,
return NULL; return NULL;
} }
if (check_uuid && grub_strcasecmp (check_uuid, uuid) != 0) if (cargs->search_uuid != NULL && grub_strcasecmp (cargs->search_uuid, uuid) != 0)
{ {
grub_dprintf ("geli", "%s != %s\n", uuid, check_uuid); grub_dprintf ("geli", "%s != %s\n", uuid, cargs->search_uuid);
return NULL; return NULL;
} }
grub-core/disk/luks.c
+4 -5
View File
@@ -63,8 +63,7 @@ gcry_err_code_t AF_merge (const gcry_md_spec_t * hash, grub_uint8_t * src,
grub_size_t blocknumbers); grub_size_t blocknumbers);
static grub_cryptodisk_t static grub_cryptodisk_t
configure_ciphers (grub_disk_t disk, const char *check_uuid, configure_ciphers (grub_disk_t disk, grub_cryptomount_args_t cargs)
int check_boot)
{ {
grub_cryptodisk_t newdev; grub_cryptodisk_t newdev;
const char *iptr; const char *iptr;
@@ -76,7 +75,7 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid,
char hashspec[sizeof (header.hashSpec) + 1]; char hashspec[sizeof (header.hashSpec) + 1];
grub_err_t err; grub_err_t err;
if (check_boot) if (cargs->check_boot)
return NULL; return NULL;
/* Read the LUKS header. */ /* Read the LUKS header. */
@@ -103,9 +102,9 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid,
} }
*optr = 0; *optr = 0;
if (check_uuid && grub_strcasecmp (check_uuid, uuid) != 0) if (cargs->search_uuid != NULL && grub_strcasecmp (cargs->search_uuid, uuid) != 0)
{ {
grub_dprintf ("luks", "%s != %s\n", uuid, check_uuid); grub_dprintf ("luks", "%s != %s\n", uuid, cargs->search_uuid);
return NULL; return NULL;
} }
grub-core/disk/luks2.c
+4 -4
View File
@@ -346,14 +346,14 @@ luks2_read_header (grub_disk_t disk, grub_luks2_header_t *outhdr)
} }
static grub_cryptodisk_t static grub_cryptodisk_t
luks2_scan (grub_disk_t disk, const char *check_uuid, int check_boot) luks2_scan (grub_disk_t disk, grub_cryptomount_args_t cargs)
{ {
grub_cryptodisk_t cryptodisk; grub_cryptodisk_t cryptodisk;
grub_luks2_header_t header; grub_luks2_header_t header;
char uuid[sizeof (header.uuid) + 1]; char uuid[sizeof (header.uuid) + 1];
grub_size_t i, j; grub_size_t i, j;
if (check_boot) if (cargs->check_boot)
return NULL; return NULL;
if (luks2_read_header (disk, &header)) if (luks2_read_header (disk, &header))
@@ -367,9 +367,9 @@ luks2_scan (grub_disk_t disk, const char *check_uuid, int check_boot)
uuid[j++] = header.uuid[i]; uuid[j++] = header.uuid[i];
uuid[j] = '\0'; uuid[j] = '\0';
if (check_uuid && grub_strcasecmp (check_uuid, uuid) != 0) if (cargs->search_uuid != NULL && grub_strcasecmp (cargs->search_uuid, uuid) != 0)
{ {
grub_dprintf ("luks2", "%s != %s\n", uuid, check_uuid); grub_dprintf ("luks2", "%s != %s\n", uuid, cargs->search_uuid);
return NULL; return NULL;
} }
include/grub/cryptodisk.h
+7 -2
View File
@@ -69,7 +69,13 @@ typedef gcry_err_code_t
struct grub_cryptomount_args struct grub_cryptomount_args
{ {
/* scan: Flag to indicate that only bootable volumes should be decrypted */
grub_uint32_t check_boot : 1;
/* scan: Only volumes matching this UUID should be decrpyted */
char *search_uuid;
/* recover_key: Key data used to decrypt voume */
grub_uint8_t *key_data; grub_uint8_t *key_data;
/* recover_key: Length of key_data */
grub_size_t key_len; grub_size_t key_len;
}; };
typedef struct grub_cryptomount_args *grub_cryptomount_args_t; typedef struct grub_cryptomount_args *grub_cryptomount_args_t;
@@ -125,8 +131,7 @@ struct grub_cryptodisk_dev
struct grub_cryptodisk_dev *next; struct grub_cryptodisk_dev *next;
struct grub_cryptodisk_dev **prev; struct grub_cryptodisk_dev **prev;
grub_cryptodisk_t (*scan) (grub_disk_t disk, const char *check_uuid, grub_cryptodisk_t (*scan) (grub_disk_t disk, grub_cryptomount_args_t cargs);
int boot_only);
grub_err_t (*recover_key) (grub_disk_t disk, grub_cryptodisk_t dev, grub_cryptomount_args_t cargs); grub_err_t (*recover_key) (grub_disk_t disk, grub_cryptodisk_t dev, grub_cryptomount_args_t cargs);
}; };
typedef struct grub_cryptodisk_dev *grub_cryptodisk_dev_t; typedef struct grub_cryptodisk_dev *grub_cryptodisk_dev_t;