eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-14 12:20:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix luksResume when called on non-LUKS device.

Browse Source
This commit is contained in:
Ondrej Kozina
2021-02-23 20:46:56 +01:00
parent 3ebf7fa3bd
commit 8e8ecd50de
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/setup.c
View File

@@ -1200,7 +1200,7 @@ static int _init_by_name_crypt(struct crypt_device *cd, const char *name)
} }
/* do not try to lookup LUKS2 header in detached header mode */ /* do not try to lookup LUKS2 header in detached header mode */
if (!cd->metadata_device && !found) { if (dmd.uuid && !cd->metadata_device && !found) {
while (*dep && !found) { while (*dep && !found) {
r = dm_query_device(cd, *dep, DM_ACTIVE_DEVICE, &dmdep); r = dm_query_device(cd, *dep, DM_ACTIVE_DEVICE, &dmdep);
if (r < 0) if (r < 0)

16
src/cryptsetup.c
View File

@@ -2247,12 +2247,24 @@ static int action_luksResume(void)
char *password = NULL; char *password = NULL;
size_t passwordLen; size_t passwordLen;
int r, tries; int r, tries;
const char *req_type = luksType(device_type);
if (req_type && !isLUKS(req_type))
return -EINVAL;
if ((r = crypt_init_by_name_and_header(&cd, action_argv[0], uuid_or_device(ARG_STR(OPT_HEADER_ID))))) if ((r = crypt_init_by_name_and_header(&cd, action_argv[0], uuid_or_device(ARG_STR(OPT_HEADER_ID)))))
goto out; return r;
if ((r = crypt_load(cd, luksType(device_type), NULL))) r = -EINVAL;
if (!isLUKS(crypt_get_type(cd))) {
log_err(_("%s is not active LUKS device name or header is missing."), action_argv[0]);
goto out; goto out;
}
if (req_type && strcmp(req_type, crypt_get_type(cd))) {
log_err(_("%s is not active %s device name."), action_argv[0], req_type);
goto out;
}
tries = _set_tries_tty(); tries = _set_tries_tty();
do { do {