lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dm verity: fix overflow check

Browse Source 
This patch fixes sector_t overflow checking in dm-verity.

Without this patch, the code checks for overflow only if sector_t is
smaller than long long, not if sector_t and long long have the same size.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
Mikulas Patocka
2012-09-26 23:45:48 +01:00
committed by Alasdair G Kergon
parent 0424caa145
commit 1d55f6bcc0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/md/dm-verity.c
View File

@@ -718,8 +718,8 @@ static int verity_ctr(struct dm_target *ti, unsigned argc, char **argv)
v->hash_dev_block_bits = ffs(num) - 1; v->hash_dev_block_bits = ffs(num) - 1;
if (sscanf(argv[5], "%llu%c", &num_ll, &dummy) != 1 || if (sscanf(argv[5], "%llu%c", &num_ll, &dummy) != 1 ||
num_ll << (v->data_dev_block_bits - SECTOR_SHIFT) != (sector_t)(num_ll << (v->data_dev_block_bits - SECTOR_SHIFT))
(sector_t)num_ll << (v->data_dev_block_bits - SECTOR_SHIFT)) { >> (v->data_dev_block_bits - SECTOR_SHIFT) != num_ll) {
ti->error = "Invalid data blocks"; ti->error = "Invalid data blocks";
r = -EINVAL; r = -EINVAL;
goto bad; goto bad;
@@ -733,8 +733,8 @@ static int verity_ctr(struct dm_target *ti, unsigned argc, char **argv)
} }
if (sscanf(argv[6], "%llu%c", &num_ll, &dummy) != 1 || if (sscanf(argv[6], "%llu%c", &num_ll, &dummy) != 1 ||
num_ll << (v->hash_dev_block_bits - SECTOR_SHIFT) != (sector_t)(num_ll << (v->hash_dev_block_bits - SECTOR_SHIFT))
(sector_t)num_ll << (v->hash_dev_block_bits - SECTOR_SHIFT)) { >> (v->hash_dev_block_bits - SECTOR_SHIFT) != num_ll) {
ti->error = "Invalid hash start"; ti->error = "Invalid hash start";
r = -EINVAL; r = -EINVAL;
goto bad; goto bad;