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

Fix debug message displaying required hash device size.

Browse Source 
If located on the same device with hashes, offset must be subtracted.
(Also there could be one block more for superblock.)
This commit is contained in:
Milan Broz
2021-02-13 19:55:14 +01:00
parent c760ae36ea
commit 75447d0d80
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/verity/verity_hash.c
View File

@@ -251,7 +251,7 @@ static int VERITY_create_or_verify_hash(struct crypt_device *cd, bool verify,
off_t hash_level_block[VERITY_MAX_LEVELS];
off_t hash_level_size[VERITY_MAX_LEVELS];
off_t data_file_blocks;
off_t data_device_size = 0, hash_device_size = 0;
off_t data_device_offset_max = 0, hash_device_offset_max = 0;
off_t hash_position = VERITY_hash_offset_block(params);
uint64_t dev_size;
int levels, i, r;
@@ -271,26 +271,25 @@ static int VERITY_create_or_verify_hash(struct crypt_device *cd, bool verify,
} else
data_file_blocks = params->data_size;
if (mult_overflow(&data_device_size, params->data_size, params->data_block_size)) {
if (mult_overflow(&data_device_offset_max, params->data_size, params->data_block_size)) {
log_err(cd, _("Device offset overflow."));
return -EINVAL;
}
log_dbg(cd, "Data device size required: %" PRIu64 " bytes.", data_device_offset_max);
if (hash_levels(params->hash_block_size, digest_size, data_file_blocks, &hash_position,
&levels, &hash_level_block[0], &hash_level_size[0])) {
log_err(cd, _("Hash area overflow."));
return -EINVAL;
}
log_dbg(cd, "Using %d hash levels.", levels);
if (mult_overflow(&hash_device_size, hash_position, params->hash_block_size)) {
if (mult_overflow(&hash_device_offset_max, hash_position, params->hash_block_size)) {
log_err(cd, _("Device offset overflow."));
return -EINVAL;
}
log_dbg(cd, "Hash device size required: %" PRIu64 " bytes.",
hash_device_offset_max - params->hash_area_offset);
log_dbg(cd, "Using %d hash levels.", levels);
log_dbg(cd, "Data device size required: %" PRIu64 " bytes.",
data_device_size);
data_file = fopen(device_path(crypt_data_device(cd)), "r");
if (!data_file) {
log_err(cd, _("Cannot open device %s."),
@@ -300,8 +299,6 @@ static int VERITY_create_or_verify_hash(struct crypt_device *cd, bool verify,
goto out;
}
log_dbg(cd, "Hash device size required: %" PRIu64 " bytes.",
hash_device_size);
hash_file = fopen(device_path(crypt_metadata_device(cd)), verify ? "r" : "r+");
if (!hash_file) {
log_err(cd, _("Cannot open device %s."),