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

Fix detection of target presence.

Browse Source
This commit is contained in:
Milan Broz
2017-06-01 12:25:39 +02:00
parent 40a9178c7f
commit 6fc383ade1
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/integrity/integrity.c
View File

@@ -175,6 +175,7 @@ int INTEGRITY_activate(struct crypt_device *cd,
struct volume_key *journal_mac_key, struct volume_key *journal_mac_key,
uint32_t flags) uint32_t flags)
{ {
uint32_t dmi_flags;
struct crypt_dm_active_device dmdi = { struct crypt_dm_active_device dmdi = {
.target = DM_INTEGRITY, .target = DM_INTEGRITY,
.data_device = crypt_data_device(cd), .data_device = crypt_data_device(cd),
@@ -210,7 +211,13 @@ int INTEGRITY_activate(struct crypt_device *cd,
if (r) if (r)
return r; return r;
return dm_create_device(cd, name, "INTEGRITY", &dmdi, 0); r = dm_create_device(cd, name, "INTEGRITY", &dmdi, 0);
if (r < 0 && (dm_flags(DM_INTEGRITY, &dmi_flags) || !(dmi_flags & DM_INTEGRITY_SUPPORTED))) {
log_err(cd, _("Kernel doesn't support dm-integrity mapping.\n"));
return -ENOTSUP;
}
return r;
} }
int INTEGRITY_format(struct crypt_device *cd, int INTEGRITY_format(struct crypt_device *cd,
@@ -218,6 +225,7 @@ int INTEGRITY_format(struct crypt_device *cd,
struct volume_key *journal_crypt_key, struct volume_key *journal_crypt_key,
struct volume_key *journal_mac_key) struct volume_key *journal_mac_key)
{ {
uint32_t dmi_flags;
char tmp_name[64], tmp_uuid[40]; char tmp_name[64], tmp_uuid[40];
struct crypt_dm_active_device dmdi = { struct crypt_dm_active_device dmdi = {
.target = DM_INTEGRITY, .target = DM_INTEGRITY,
@@ -255,6 +263,10 @@ int INTEGRITY_format(struct crypt_device *cd,
device_path(dmdi.data_device), tmp_name, dmdi.u.integrity.tag_size); device_path(dmdi.data_device), tmp_name, dmdi.u.integrity.tag_size);
r = device_block_adjust(cd, dmdi.data_device, DEV_EXCL, dmdi.u.integrity.offset, NULL, NULL); r = device_block_adjust(cd, dmdi.data_device, DEV_EXCL, dmdi.u.integrity.offset, NULL, NULL);
if (r < 0 && (dm_flags(DM_INTEGRITY, &dmi_flags) || !(dmi_flags & DM_INTEGRITY_SUPPORTED))) {
log_err(cd, _("Kernel doesn't support dm-integrity mapping.\n"));
return -ENOTSUP;
}
if (r) if (r)
return r; return r;

4
lib/tcrypt/tcrypt.c
View File

@@ -817,8 +817,8 @@ int TCRYPT_activate(struct crypt_device *cd,
break; break;
} }
if (r < 0 && !dm_flags(DM_CRYPT, &dmc_flags) && if (r < 0 &&
(dmc_flags & req_flags) != req_flags) { (dm_flags(DM_CRYPT, &dmc_flags) || ((dmc_flags & req_flags) != req_flags))) {
log_err(cd, _("Kernel doesn't support TCRYPT compatible mapping.\n")); log_err(cd, _("Kernel doesn't support TCRYPT compatible mapping.\n"));
r = -ENOTSUP; r = -ENOTSUP;
} }

2
lib/verity/verity.c
View File

@@ -290,7 +290,7 @@ int VERITY_activate(struct crypt_device *cd,
} }
r = dm_create_device(cd, name, CRYPT_VERITY, &dmd, 0); r = dm_create_device(cd, name, CRYPT_VERITY, &dmd, 0);
if (r < 0 && !dm_flags(DM_VERITY, &dmv_flags) && !(dmv_flags & DM_VERITY_SUPPORTED)) { if (r < 0 && (dm_flags(DM_VERITY, &dmv_flags) || !(dmv_flags & DM_VERITY_SUPPORTED))) {
log_err(cd, _("Kernel doesn't support dm-verity mapping.\n")); log_err(cd, _("Kernel doesn't support dm-verity mapping.\n"));
return -ENOTSUP; return -ENOTSUP;
} }