diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2013-06-28 10:56:31 -0400 |
|---|---|---|
| committer | Milan Broz <gmazyland@gmail.com> | 2013-06-28 17:05:45 +0200 |
| commit | 4f990d5a74898e494f3b7043a79a9af904e253ab (patch) | |
| tree | c32345052ebbf13945f51565b74b61e9ab4afde8 | |
| parent | 1349efa34db577947083daee2e521770614fcfe0 (diff) | |
| download | cryptsetup-4f990d5a74898e494f3b7043a79a9af904e253ab.tar.gz cryptsetup-4f990d5a74898e494f3b7043a79a9af904e253ab.tar.bz2 cryptsetup-4f990d5a74898e494f3b7043a79a9af904e253ab.zip | |
dm-verity: Fix a boundary condition that caused failure for certain device sizes
On Fri, 28 Jun 2013, Mikulas Patocka wrote:
Fix a boundary condition that caused failure for certain device sizes
The problem is reported at
http://code.google.com/p/cryptsetup/issues/detail?id=160
This is the userspace fix.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com
| -rw-r--r-- | lib/verity/verity_hash.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/verity/verity_hash.c b/lib/verity/verity_hash.c index 07a20c9..3f25e91 100644 --- a/lib/verity/verity_hash.c +++ b/lib/verity/verity_hash.c @@ -220,7 +220,7 @@ static int VERITY_create_or_verify_hash(struct crypt_device *cd, off_t hash_level_block[VERITY_MAX_LEVELS]; off_t hash_level_size[VERITY_MAX_LEVELS]; off_t data_file_blocks, s; - size_t hash_per_block, hash_per_block_bits; + size_t hash_per_block_bits; off_t data_device_size = 0, hash_device_size = 0; uint64_t dev_size; int levels, i, r; @@ -251,7 +251,6 @@ static int VERITY_create_or_verify_hash(struct crypt_device *cd, } hash_per_block_bits = get_bits_down(hash_block_size / digest_size); - hash_per_block = 1 << hash_per_block_bits; if (!hash_per_block_bits) return -EINVAL; @@ -271,8 +270,7 @@ static int VERITY_create_or_verify_hash(struct crypt_device *cd, for (i = levels - 1; i >= 0; i--) { hash_level_block[i] = hash_position; // verity position of block data_file_blocks at level i - s = data_file_blocks >> (i * hash_per_block_bits); - s = (s + hash_per_block - 1) / hash_per_block; + s = (data_file_blocks + ((off_t)1 << ((i + 1) * hash_per_block_bits)) - 1) >> ((i + 1) * hash_per_block_bits); hash_level_size[i] = s; if ((hash_position + s) < hash_position || (hash_position + s) < 0) { |