From: Fam Zheng <famz@redhat.com>
Date: Mon, 27 Apr 2015 14:23:01 +0000 (+0800)
Subject: vmdk: Widen before shifting 32 bit header field
X-Git-Tag: v2.4.0-rc0~158^2~4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7237aecd7e8fcc3ccf7fded77b6c127b4df5d3ac;p=qemu-xen-unstable.git

vmdk: Widen before shifting 32 bit header field

Coverity spotted this.

The field is 32 bits, but if it's possible to overflow in 32 bit
left shift.

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/vmdk.c b/block/vmdk.c
index fd94b8f605..1c5e2ef1b3 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -523,7 +523,7 @@ static int vmdk_open_vmfs_sparse(BlockDriverState *bs,
     }
     ret = vmdk_add_extent(bs, file, false,
                           le32_to_cpu(header.disk_sectors),
-                          le32_to_cpu(header.l1dir_offset) << 9,
+                          (int64_t)le32_to_cpu(header.l1dir_offset) << 9,
                           0,
                           le32_to_cpu(header.l1dir_size),
                           4096,