From 66176fc6a7b86fcead206fb0685ba688e40646a9 Mon Sep 17 00:00:00 2001 From: Jeff Cody Date: Tue, 22 Mar 2016 23:33:42 -0400 Subject: block/vpc: make checks on max table size a bit more lax The check on the max_table_size field not being larger than required is valid, and in accordance with the VHD spec. However, there have been VHD images encountered in the wild that have an out-of-spec max table size that is technically too large. There is no issue in allowing this larger table size, as we also later verify that the computed size (used for the pagetable) is large enough to fit all sectors. In addition, max_table_entries is bounds checked against SIZE_MAX and INT_MAX. Remove the strict check, so that we can accomodate these sorts of images that are benignly out of spec. Reported-by: Stefan Hajnoczi Reported-by: Grant Wu Signed-off-by: Jeff Cody Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- block/vpc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/block/vpc.c b/block/vpc.c index 03aee81f86..0eef099532 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -351,10 +351,6 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, ret = -EINVAL; goto fail; } - if (s->max_table_entries > (VHD_MAX_SECTORS * 512) / s->block_size) { - ret = -EINVAL; - goto fail; - } computed_size = (uint64_t) s->max_table_entries * s->block_size; if (computed_size < bs->total_sectors * 512) { -- cgit v1.2.1