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

TCRYPT: support proper device removal

Browse Source
This commit is contained in:
Milan Broz
2012-11-22 14:19:43 +01:00
parent c26bb0f38a
commit 3faaa8b227
3 changed files with 64 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/setup.c
View File

@@ -750,6 +750,8 @@ static int _init_by_name_crypt(struct crypt_device *cd, const char *name)
goto out; goto out;
} }
} }
} else if (isTCRYPT(cd->type)) {
//FIXME
} }
out: out:
crypt_free_volume_key(dmd.u.crypt.vk); crypt_free_volume_key(dmd.u.crypt.vk);
@@ -855,6 +857,8 @@ int crypt_init_by_name_and_header(struct crypt_device **cd,
(*cd)->type = strdup(CRYPT_LUKS1); (*cd)->type = strdup(CRYPT_LUKS1);
else if (!strncmp(CRYPT_VERITY, dmd.uuid, sizeof(CRYPT_VERITY)-1)) else if (!strncmp(CRYPT_VERITY, dmd.uuid, sizeof(CRYPT_VERITY)-1))
(*cd)->type = strdup(CRYPT_VERITY); (*cd)->type = strdup(CRYPT_VERITY);
else if (!strncmp(CRYPT_TCRYPT, dmd.uuid, sizeof(CRYPT_TCRYPT)-1))
(*cd)->type = strdup(CRYPT_TCRYPT);
else else
log_dbg("Unknown UUID set, some parameters are not set."); log_dbg("Unknown UUID set, some parameters are not set.");
} else } else
@@ -1301,6 +1305,9 @@ int crypt_resize(struct crypt_device *cd, const char *name, uint64_t new_size)
r = 0; r = 0;
} else { } else {
dmd.size = new_size; dmd.size = new_size;
if (isTCRYPT(cd->type))
r = -ENOTSUP;
else
r = dm_create_device(cd, name, cd->type, &dmd, 1); r = dm_create_device(cd, name, cd->type, &dmd, 1);
} }
out: out:
@@ -2075,6 +2082,9 @@ int crypt_deactivate(struct crypt_device *cd, const char *name)
switch (crypt_status(cd, name)) { switch (crypt_status(cd, name)) {
case CRYPT_ACTIVE: case CRYPT_ACTIVE:
case CRYPT_BUSY: case CRYPT_BUSY:
if (isTCRYPT(cd->type))
r = TCRYPT_deactivate(cd, name);
else
r = dm_remove_device(cd, name, 0, 0); r = dm_remove_device(cd, name, 0, 0);
break; break;
case CRYPT_INACTIVE: case CRYPT_INACTIVE:

49
lib/tcrypt/tcrypt.c
View File

@@ -573,3 +573,52 @@ int TCRYPT_activate(struct crypt_device *cd,
crypt_free_volume_key(dmd.u.crypt.vk); crypt_free_volume_key(dmd.u.crypt.vk);
return r; return r;
} }
static int remove_one(struct crypt_device *cd, const char *name,
const char *base_uuid, int index)
{
struct crypt_dm_active_device dmd = {};
char dm_name[PATH_MAX];
int r;
if (snprintf(dm_name, sizeof(dm_name), "%s_%d", name, index) < 0)
return -ENOMEM;
r = dm_status_device(cd, dm_name);
if (r < 0)
return r;
r = dm_query_device(cd, dm_name, DM_ACTIVE_UUID, &dmd);
if (!r && !strncmp(dmd.uuid, base_uuid, strlen(base_uuid)))
r = dm_remove_device(cd, dm_name, 0, 0);
free(CONST_CAST(void*)dmd.uuid);
return r;
}
int TCRYPT_deactivate(struct crypt_device *cd, const char *name)
{
struct crypt_dm_active_device dmd = {};
int r;
r = dm_query_device(cd, name, DM_ACTIVE_UUID, &dmd);
if (r < 0)
return r;
if (!dmd.uuid)
return -EINVAL;
r = dm_remove_device(cd, name, 0, 0);
if (r < 0)
goto out;
r = remove_one(cd, name, dmd.uuid, 1);
if (r < 0)
goto out;
r = remove_one(cd, name, dmd.uuid, 2);
if (r < 0)
goto out;
out:
free(CONST_CAST(void*)dmd.uuid);
return (r == -ENODEV) ? 0 : r;
}

3
lib/tcrypt/tcrypt.h
View File

@@ -74,4 +74,7 @@ int TCRYPT_activate(struct crypt_device *cd,
struct crypt_params_tcrypt *params, struct crypt_params_tcrypt *params,
uint32_t flags); uint32_t flags);
int TCRYPT_deactivate(struct crypt_device *cd,
const char *name);
#endif #endif