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

tcrypt: Fix detecting status of chained modes

Browse Source 
The function dm_uuid_cmp cannot be used for TCRYPT, it expects
LUKS UUID, not a device name.

Fixes: #952
This commit is contained in:
Milan Broz
2025-08-08 11:15:32 +02:00
parent 57a8837879
commit 10e5ab1a87
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/tcrypt/tcrypt.c
View File

@@ -928,14 +928,16 @@ out:
static bool is_tcrypt_subdev(const char *dm_uuid, const char *base_uuid) static bool is_tcrypt_subdev(const char *dm_uuid, const char *base_uuid)
{ {
assert(base_uuid); const char *base_uuid_name;
if (!dm_uuid) assert(base_uuid);
base_uuid_name = strchr(base_uuid, '-');
if (!dm_uuid || !base_uuid_name)
return false; return false;
if (!strncmp(dm_uuid, "SUBDEV-", 7)) if (!strncmp(dm_uuid, "SUBDEV-", 7))
/* dm_uuid + 6 because function requires dm_uuid to contain '-' */ return !strncmp(dm_uuid + 6, base_uuid_name, strlen(base_uuid_name));
return !dm_uuid_cmp(dm_uuid + 6, strchr(base_uuid, '-'));
/* /*
* FIXME: Drop after shift to dependency based deactivation (CRYPT_SUBDEV) * FIXME: Drop after shift to dependency based deactivation (CRYPT_SUBDEV)