diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2012-09-26 23:45:48 +0100 |
|---|---|---|
| committer | Alasdair G Kergon <agk@redhat.com> | 2012-09-26 23:45:48 +0100 |
| commit | 1d55f6bcc0331d744cd5b56c4ee79e3809438161 (patch) | |
| tree | e8e5ceddc169a572269677cab22db02c99ee72f6 /drivers/md | |
| parent | 0424caa14508f19ca8093d36c15250e0331a3a0a (diff) | |
| download | linux-3.10-1d55f6bcc0331d744cd5b56c4ee79e3809438161.tar.gz linux-3.10-1d55f6bcc0331d744cd5b56c4ee79e3809438161.tar.bz2 linux-3.10-1d55f6bcc0331d744cd5b56c4ee79e3809438161.zip | |
dm verity: fix overflow check
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>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm-verity.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/md/dm-verity.c b/drivers/md/dm-verity.c index 254d19268ad..892ae2766aa 100644 --- a/drivers/md/dm-verity.c +++ b/drivers/md/dm-verity.c @@ -718,8 +718,8 @@ static int verity_ctr(struct dm_target *ti, unsigned argc, char **argv) v->hash_dev_block_bits = ffs(num) - 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"; r = -EINVAL; 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 || - 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"; r = -EINVAL; goto bad; |