From: Peter Maydell <[email protected]> In vmdk_open_vmdk4() we set the uint32_t l1_entry_sectors with: l1_entry_sectors = le32_to_cpu(header.num_gtes_per_gt) * le64_to_cpu(header.granularity);
We have checked that num_gtes_per_gt is at most 512, but the header.granularity has not been checked at this point, and so the multiply can overflow the 32-bit variable. This overflow is harmless beacuse we're about to call vmdk_add_extent(), which will fail if the header.granularity (cluster_sectors) is more than 0x20_0000, but it's a potential trap for the future if code that relies on the l1_entry_sectors value gets added between where we set it and where we make that check. Check for overlarge granularity at the point of multiplication so it's clear we can't overflow. Cc: [email protected] Reported-by: Tristan <https://gitlab.com/TristanInSec> Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4029 Signed-off-by: Peter Maydell <[email protected]> Message-ID: <[email protected]> Reviewed-by: Kevin Wolf <[email protected]> Signed-off-by: Kevin Wolf <[email protected]> --- block/vmdk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/block/vmdk.c b/block/vmdk.c index d7e23ae8098..a9bd8a4245f 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1052,7 +1052,10 @@ vmdk_open_vmdk4(BlockDriverState *bs, BdrvChild *file, int flags, error_setg(errp, "L2 table size too big"); return -EINVAL; } - + if (le64_to_cpu(header.granularity) > 0x200000) { + error_setg(errp, "Invalid granularity, image may be corrupt"); + return -EFBIG; + } l1_entry_sectors = le32_to_cpu(header.num_gtes_per_gt) * le64_to_cpu(header.granularity); if (l1_entry_sectors == 0) { -- 2.56.0
