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

Introduce LUKS2-OPAL private dm uuid prefix.

Browse Source 
LUKS2 devices with configured HW OPAL encryption (any configuration)
get activated with private dm uuid prefix LUKS2-OPAL so that we
can properly detect devices with HW OPAL encryption even with
missing LUKS2 header (detached header). Internally LUKS2-OPAL
prefix matches LUKS2 device type.
This commit is contained in:
Ondrej Kozina
2023-07-31 16:24:49 +02:00
parent fc04761cdc
commit b60ffe9e06
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/internal.h
View File

@@ -53,6 +53,7 @@
#define MAX_DM_DEPS 32 #define MAX_DM_DEPS 32
#define CRYPT_SUBDEV "SUBDEV" /* prefix for sublayered devices underneath public crypt types */ #define CRYPT_SUBDEV "SUBDEV" /* prefix for sublayered devices underneath public crypt types */
#define CRYPT_LUKS2_HW_OPAL "LUKS2-OPAL" /* dm uuid prefix used for any HW OPAL enabled LUKS2 device */
#ifndef O_CLOEXEC #ifndef O_CLOEXEC
#define O_CLOEXEC 0 #define O_CLOEXEC 0

8
lib/luks2/luks2_json_metadata.c
View File

@@ -2754,9 +2754,13 @@ int LUKS2_activate(struct crypt_device *cd,
if (dynamic) if (dynamic)
dmd.segment.size = dmdi.segment.size; dmd.segment.size = dmdi.segment.size;
r = create_or_reload_device_with_integrity(cd, name, CRYPT_LUKS2, &dmd, &dmdi); r = create_or_reload_device_with_integrity(cd, name,
opal_key ? CRYPT_LUKS2_HW_OPAL : CRYPT_LUKS2,
&dmd, &dmdi);
} else } else
r = create_or_reload_device(cd, name, CRYPT_LUKS2, &dmd); r = create_or_reload_device(cd, name,
opal_key ? CRYPT_LUKS2_HW_OPAL : CRYPT_LUKS2,
&dmd);
dm_targets_free(cd, &dmd); dm_targets_free(cd, &dmd);
dm_targets_free(cd, &dmdi); dm_targets_free(cd, &dmdi);

4
lib/setup.c
View File

@@ -504,6 +504,10 @@ int crypt_uuid_cmp(const char *dm_uuid, const char *hdr_uuid)
if (!dm_uuid || !hdr_uuid) if (!dm_uuid || !hdr_uuid)
return -EINVAL; return -EINVAL;
/* skip beyond LUKS2_HW_OPAL prefix */
if (!strncmp(dm_uuid, CRYPT_LUKS2_HW_OPAL, strlen(CRYPT_LUKS2_HW_OPAL)))
dm_uuid = dm_uuid + strlen(CRYPT_LUKS2_HW_OPAL);
str = strchr(dm_uuid, '-'); str = strchr(dm_uuid, '-');
if (!str) if (!str)
return -EINVAL; return -EINVAL;