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

Fix some extended compiler warnings.

Browse Source
This commit is contained in:
Milan Broz
2020-01-03 12:17:05 +01:00
parent 02821adc47
commit d9766037a3
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libdevmapper.c
View File

@@ -2193,7 +2193,8 @@ static int _dm_target_query_verity(struct crypt_device *cd,
str = strsep(&params, " "); str = strsep(&params, " ");
if (!str) if (!str)
goto err; goto err;
root_hash_sig_key_desc = strdup(str); if (!root_hash_sig_key_desc)
root_hash_sig_key_desc = strdup(str);
i++; i++;
} else /* unknown option */ } else /* unknown option */
goto err; goto err;
@@ -2228,6 +2229,7 @@ err:
device_free(cd, data_device); device_free(cd, data_device);
device_free(cd, hash_device); device_free(cd, hash_device);
device_free(cd, fec_device); device_free(cd, fec_device);
free(root_hash_sig_key_desc);
free(root_hash); free(root_hash);
free(hash_name); free(hash_name);
free(salt); free(salt);

7
lib/verity/verity_hash.c
View File

@@ -102,7 +102,7 @@ static int hash_levels(size_t hash_block_size, size_t digest_size,
off_t *hash_level_block, off_t *hash_level_size) off_t *hash_level_block, off_t *hash_level_size)
{ {
size_t hash_per_block_bits; size_t hash_per_block_bits;
off_t s; off_t s, s_shift;
int i; int i;
if (!digest_size) if (!digest_size)
@@ -124,7 +124,10 @@ static int hash_levels(size_t hash_block_size, size_t digest_size,
if (hash_level_block) if (hash_level_block)
hash_level_block[i] = *hash_position; hash_level_block[i] = *hash_position;
// verity position of block data_file_blocks at level i // verity position of block data_file_blocks at level i
s = (data_file_blocks + ((off_t)1 << ((i + 1) * hash_per_block_bits)) - 1) >> ((i + 1) * hash_per_block_bits); s_shift = (i + 1) * hash_per_block_bits;
if (s_shift > 63)
return -EINVAL;
s = (data_file_blocks + ((off_t)1 << s_shift) - 1) >> ((i + 1) * hash_per_block_bits);
if (hash_level_size) if (hash_level_size)
hash_level_size[i] = s; hash_level_size[i] = s;
if ((*hash_position + s) < *hash_position || if ((*hash_position + s) < *hash_position ||