OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vmdk: use unsigned values for on disk header fields

Browse Source 
The size and offset fields are all non-negative values, use uint64_t for
them to avoid getting negative in memory value by int overflow.

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Fam Zheng 2013-08-06 15:44:48 +08:00 committed by Kevin Wolf
parent 5d8caa543c
commit e98768d437
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
block/vmdk.c
View File

@ -67,14 +67,14 @@ typedef struct {
typedef struct { typedef struct {
uint32_t version; uint32_t version;
uint32_t flags; uint32_t flags;
int64_t capacity; uint64_t capacity;
int64_t granularity; uint64_t granularity;
int64_t desc_offset; uint64_t desc_offset;
int64_t desc_size; uint64_t desc_size;
int32_t num_gtes_per_gte; uint32_t num_gtes_per_gte;
int64_t rgd_offset; uint64_t rgd_offset;
int64_t gd_offset; uint64_t gd_offset;
int64_t grain_offset; uint64_t grain_offset;
char filler[1]; char filler[1];
char check_bytes[4]; char check_bytes[4];
uint16_t compressAlgorithm; uint16_t compressAlgorithm;
@ -109,7 +109,7 @@ typedef struct VmdkExtent {
typedef struct BDRVVmdkState { typedef struct BDRVVmdkState {
CoMutex lock; CoMutex lock;
int desc_offset; uint64_t desc_offset;
bool cid_updated; bool cid_updated;
uint32_t parent_cid; uint32_t parent_cid;
int num_extents; int num_extents;
@ -490,7 +490,7 @@ static int vmdk_open_vmdk3(BlockDriverState *bs,
} }
static int vmdk_open_desc_file(BlockDriverState *bs, int flags, static int vmdk_open_desc_file(BlockDriverState *bs, int flags,
int64_t desc_offset); uint64_t desc_offset);
static int vmdk_open_vmdk4(BlockDriverState *bs, static int vmdk_open_vmdk4(BlockDriverState *bs,
BlockDriverState *file, BlockDriverState *file,
@ -508,7 +508,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
return ret; return ret;
} }
if (header.capacity == 0) { if (header.capacity == 0) {
int64_t desc_offset = le64_to_cpu(header.desc_offset); uint64_t desc_offset = le64_to_cpu(header.desc_offset);
if (desc_offset) { if (desc_offset) {
return vmdk_open_desc_file(bs, flags, desc_offset << 9); return vmdk_open_desc_file(bs, flags, desc_offset << 9);
} }
@ -728,7 +728,7 @@ next_line:
} }
static int vmdk_open_desc_file(BlockDriverState *bs, int flags, static int vmdk_open_desc_file(BlockDriverState *bs, int flags,
int64_t desc_offset) uint64_t desc_offset)
{ {
int ret; int ret;
char *buf = NULL; char *buf = NULL;