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

Detect dm-verity in kernel.

Browse Source
This commit is contained in:
Milan Broz
2012-06-07 12:32:06 +02:00
parent 4b0b82adc5
commit 0e79728f86
4 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libdevmapper.c
View File

@@ -127,6 +127,16 @@ static void _dm_set_crypt_compat(const char *dm_version, unsigned crypt_maj,
_dm_crypt_checked = 1; _dm_crypt_checked = 1;
} }
static void _dm_set_verity_compat(const char *dm_version, unsigned verity_maj,
unsigned verity_min, unsigned verity_patch)
{
if (verity_maj > 0)
_dm_crypt_flags |= DM_VERITY_SUPPORTED;
log_dbg("Detected dm-verity version %i.%i.%i.",
verity_maj, verity_min, verity_patch);
}
static int _dm_check_versions(void) static int _dm_check_versions(void)
{ {
struct dm_task *dmt; struct dm_task *dmt;
@@ -158,6 +168,11 @@ static int _dm_check_versions(void)
(unsigned)target->version[0], (unsigned)target->version[0],
(unsigned)target->version[1], (unsigned)target->version[1],
(unsigned)target->version[2]); (unsigned)target->version[2]);
} else if (!strcmp(DM_VERITY_TARGET, target->name)) {
_dm_set_verity_compat(dm_version,
(unsigned)target->version[0],
(unsigned)target->version[1],
(unsigned)target->version[2]);
} }
target = (struct dm_versions *)((char *) target + target->next); target = (struct dm_versions *)((char *) target + target->next);
} while (last_target != target); } while (last_target != target);

1
lib/utils_dm.h
View File

@@ -35,6 +35,7 @@ struct crypt_params_verity;
#define DM_SECURE_SUPPORTED (1 << 2) /* wipe (secure) buffer flag */ #define DM_SECURE_SUPPORTED (1 << 2) /* wipe (secure) buffer flag */
#define DM_PLAIN64_SUPPORTED (1 << 3) /* plain64 IV */ #define DM_PLAIN64_SUPPORTED (1 << 3) /* plain64 IV */
#define DM_DISCARDS_SUPPORTED (1 << 4) /* discards/TRIM option is supported */ #define DM_DISCARDS_SUPPORTED (1 << 4) /* discards/TRIM option is supported */
#define DM_VERITY_SUPPORTED (1 << 5) /* dm-verity target supported */
uint32_t dm_flags(void); uint32_t dm_flags(void);
#define DM_ACTIVE_DEVICE (1 << 0) #define DM_ACTIVE_DEVICE (1 << 0)

4
lib/verity/verity.c
View File

@@ -190,6 +190,10 @@ int VERITY_activate(struct crypt_device *cd,
return r; return r;
r = dm_create_verity(name, verity_hdr, &dmd); r = dm_create_verity(name, verity_hdr, &dmd);
if (!r && !(dm_flags() & DM_VERITY_SUPPORTED)) {
log_err(cd, _("Kernel doesn't support dm-verity mapping.\n"));
return -ENOTSUP;
}
if (r < 0) if (r < 0)
return r; return r;

1
src/veritysetup.c
View File

@@ -18,7 +18,6 @@
*/ */
/* TODO: /* TODO:
* - detect dm-verity (devmapper)
* - init_by_name() * - init_by_name()
* - unify units / uint64 etc * - unify units / uint64 etc
* - check translations * - check translations