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

Return error for conflicting requests.

Browse Source 
Return error when CRYPT_ACTIVATE_KEYRING_KEY flag is
raised but activation with vk in kernel keyring is not
possible.
This commit is contained in:
Ondrej Kozina
2018-01-15 16:14:56 +01:00
committed by Milan Broz
parent 598dd672bc
commit de76628539
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/setup.c
View File

@@ -2964,6 +2964,9 @@ static int _activate_by_passphrase(struct crypt_device *cd,
int r; int r;
struct volume_key *vk = NULL; struct volume_key *vk = NULL;
if ((flags & CRYPT_ACTIVATE_KEYRING_KEY) && !crypt_use_keyring_for_vk(cd))
return -EINVAL;
/* plain, use hashed passphrase */ /* plain, use hashed passphrase */
if (isPLAIN(cd->type)) { if (isPLAIN(cd->type)) {
if (!name) if (!name)
@@ -3072,7 +3075,8 @@ int crypt_activate_by_keyfile_device_offset(struct crypt_device *cd,
unsigned int key_count = 0; unsigned int key_count = 0;
int r; int r;
if (!cd || !keyfile) if (!cd || !keyfile ||
((flags & CRYPT_ACTIVATE_KEYRING_KEY) && !crypt_use_keyring_for_vk(cd)))
return -EINVAL; return -EINVAL;
log_dbg("%s volume %s [keyslot %d] using keyfile %s.", log_dbg("%s volume %s [keyslot %d] using keyfile %s.",
@@ -3202,7 +3206,8 @@ int crypt_activate_by_volume_key(struct crypt_device *cd,
struct volume_key *vk = NULL; struct volume_key *vk = NULL;
int r; int r;
if (!cd) if (!cd ||
((flags & CRYPT_ACTIVATE_KEYRING_KEY) && !crypt_use_keyring_for_vk(cd)))
return -EINVAL; return -EINVAL;
log_dbg("%s volume %s by volume key.", name ? "Activating" : "Checking", log_dbg("%s volume %s by volume key.", name ? "Activating" : "Checking",