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

Do not resume device when not suspended.

Browse Source 
Abort action luksResume early if device is not suspended.
We would needlesly ask for passphrase or load cryptsetup
plugins only to fail later in crypt_resume_by_* API.
This commit is contained in:
Ondrej Kozina
2021-08-26 15:47:41 +02:00
parent fea648cb1d
commit ab295b1159
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cryptsetup.c
View File

@@ -2189,6 +2189,7 @@ static int action_luksResume(void)
char *password = NULL;
size_t passwordLen;
int r, tries;
struct crypt_active_device cad;
const char *req_type = luksType(device_type);
if (req_type && !isLUKS(req_type))
@@ -2208,6 +2209,16 @@ static int action_luksResume(void)
goto out;
}
r = crypt_get_active_device(cd, action_argv[0], &cad);
if (r < 0)
goto out;
if (!(cad.flags & CRYPT_ACTIVATE_SUSPENDED)) {
log_err(_("Volume %s is not suspended."), action_argv[0]);
r = -EINVAL;
goto out;
}
/* try to resume LUKS2 device by token first */
r = crypt_resume_by_token_pin(cd, action_argv[0], ARG_STR(OPT_TOKEN_TYPE_ID),
ARG_INT32(OPT_TOKEN_ID_ID), NULL, 0, NULL);