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

Check for data device and hash device area overlap in veritysetup.

Browse Source 
Thanks Michal Virgovic for tests.
This commit is contained in:
Milan Broz
2016-12-13 13:52:05 +01:00
parent 50412375da
commit 0185defb7f
4 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/setup.c
View File

@@ -1188,6 +1188,12 @@ static int _crypt_format_verity(struct crypt_device *cd,
} else
cd->u.verity.hdr.data_size = params->data_size;
if (device_is_identical(crypt_metadata_device(cd), crypt_data_device(cd)) &&
(cd->u.verity.hdr.data_size * params->data_block_size) > params->hash_area_offset) {
log_err(cd, _("Data area overlaps with hash area.\n"));
return -EINVAL;
}
hash_size = crypt_hash_size(params->hash_name);
if (hash_size <= 0) {
log_err(cd, _("Hash algorithm %s not supported.\n"),