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

Enhance persistent flags handling in cryptsetup.

Browse Source 
With --persistent option, write only flags actually
used during activation. In other words we will not
store anymore flags not supported by running kernel.
This commit is contained in:
Ondrej Kozina
2018-02-23 12:00:50 +01:00
committed by Milan Broz
parent f6cb8e4118
commit 471f781022
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cryptsetup.c
View File

@@ -1077,6 +1077,17 @@ out:
return r; return r;
} }
static int update_persistent_flags(struct crypt_device *cd, const char *name, uint32_t activation_flags)
{
struct crypt_active_device cad;
/* write only flags not filtered by current kernel during activation */
if (crypt_get_active_device(cd, name, &cad))
return -EINVAL;
return crypt_persistent_flags_set(cd, CRYPT_FLAGS_ACTIVATION, cad.flags & activation_flags);
}
static int action_open_luks(void) static int action_open_luks(void)
{ {
struct crypt_device *cd = NULL; struct crypt_device *cd = NULL;
@@ -1139,10 +1150,9 @@ static int action_open_luks(void)
} }
out: out:
if (r >= 0 && opt_persistent && if (r >= 0 && opt_persistent &&
crypt_persistent_flags_set(cd, CRYPT_FLAGS_ACTIVATION, activate_flags)) update_persistent_flags(cd, activated_name, activate_flags))
log_err(_("Device activated but cannot make flags persistent.\n")); log_err(_("Device activated but cannot make flags persistent.\n"));
crypt_safe_free(key); crypt_safe_free(key);
crypt_safe_free(password); crypt_safe_free(password);
crypt_free(cd); crypt_free(cd);