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

FEC-area overlap detection.

Browse Source
This commit is contained in:
Michal Virgovic
2017-07-11 14:27:19 +02:00
committed by Milan Broz
parent a36c53af99
commit 913c9aa3d3
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/setup.c
View File

@@ -1102,7 +1102,7 @@ static int _crypt_format_verity(struct crypt_device *cd,
struct crypt_params_verity *params) struct crypt_params_verity *params)
{ {
int r = 0, hash_size; int r = 0, hash_size;
uint64_t data_device_size; uint64_t data_device_size, hash_blocks_size;
if (!crypt_metadata_device(cd)) { if (!crypt_metadata_device(cd)) {
log_err(cd, _("Can't format VERITY without device.\n")); log_err(cd, _("Can't format VERITY without device.\n"));
@@ -1154,10 +1154,6 @@ static int _crypt_format_verity(struct crypt_device *cd,
return -EINVAL; return -EINVAL;
} }
if (params->fec_device &&
(r = device_alloc(&cd->u.verity.fec_device, params->fec_device)) < 0)
return r;
hash_size = crypt_hash_size(params->hash_name); hash_size = crypt_hash_size(params->hash_name);
if (hash_size <= 0) { if (hash_size <= 0) {
log_err(cd, _("Hash algorithm %s not supported.\n"), log_err(cd, _("Hash algorithm %s not supported.\n"),
@@ -1166,6 +1162,25 @@ static int _crypt_format_verity(struct crypt_device *cd,
} }
cd->u.verity.root_hash_size = hash_size; cd->u.verity.root_hash_size = hash_size;
if (params->fec_device) {
r = device_alloc(&cd->u.verity.fec_device, params->fec_device);
if (r < 0)
return r;
hash_blocks_size = VERITY_hash_blocks(cd, params) * params->hash_block_size;
if (device_is_identical(crypt_metadata_device(cd), cd->u.verity.fec_device) &&
(params->hash_area_offset + hash_blocks_size) > params->fec_area_offset) {
log_err(cd, _("Hash area overlaps with FEC area.\n"));
return -EINVAL;
}
if (device_is_identical(crypt_data_device(cd), cd->u.verity.fec_device) &&
(cd->u.verity.hdr.data_size * params->data_block_size) > params->fec_area_offset) {
log_err(cd, _("Data area overlaps with FEC area.\n"));
return -EINVAL;
}
}
cd->u.verity.root_hash = malloc(cd->u.verity.root_hash_size); cd->u.verity.root_hash = malloc(cd->u.verity.root_hash_size);
if (!cd->u.verity.root_hash) if (!cd->u.verity.root_hash)
return -ENOMEM; return -ENOMEM;