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

Re-check flags after DM device creations.

Browse Source
This commit is contained in:
Milan Broz
2014-07-24 11:52:58 +02:00
parent 2250d5f71f
commit 3640eaa726
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libdevmapper.c
View File

@@ -566,6 +566,9 @@ static int _dm_create_device(const char *name, const char *type,
uint32_t cookie = 0; uint32_t cookie = 0;
uint16_t udev_flags = 0; uint16_t udev_flags = 0;
if (!params)
return -EINVAL;
if (flags & CRYPT_ACTIVATE_PRIVATE) if (flags & CRYPT_ACTIVATE_PRIVATE)
udev_flags = CRYPT_TEMP_UDEV_FLAGS; udev_flags = CRYPT_TEMP_UDEV_FLAGS;
@@ -646,6 +649,10 @@ out_no_removal:
dm_task_destroy(dmt); dm_task_destroy(dmt);
dm_task_update_nodes(); dm_task_update_nodes();
/* If code just loaded target module, update versions */
_dm_check_versions();
return r; return r;
} }
@@ -655,7 +662,7 @@ int dm_create_device(struct crypt_device *cd, const char *name,
int reload) int reload)
{ {
char *table_params = NULL; char *table_params = NULL;
int r = -EINVAL; int r;
if (!type) if (!type)
return -EINVAL; return -EINVAL;
@@ -668,10 +675,9 @@ int dm_create_device(struct crypt_device *cd, const char *name,
else if (dmd->target == DM_VERITY) else if (dmd->target == DM_VERITY)
table_params = get_dm_verity_params(dmd->u.verity.vp, dmd); table_params = get_dm_verity_params(dmd->u.verity.vp, dmd);
if (table_params) r = _dm_create_device(name, type, dmd->data_device,
r = _dm_create_device(name, type, dmd->data_device, dmd->flags, dmd->uuid, dmd->size,
dmd->flags, dmd->uuid, dmd->size, table_params, reload);
table_params, reload);
crypt_safe_free(table_params); crypt_safe_free(table_params);
dm_exit_context(); dm_exit_context();