david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vmdk: return ERROR when cluster sector is larger than vmdk limitation

Browse Source 
VMDK has a hard limitation of extent size, which is due to the size of grain
table entry is 32 bits. It means it can only point to a grain located at
offset = 2^32. To avoid writing the user data beyond limitation and record a useless offset
in grain table. We should return ERROR here.

Signed-off-by: yuchenlin <yuchenlin@synology.com>
Message-id: 20180322133337.28024-1-yuchenlin@synology.com
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
yuchenlin 2018-03-22 21:33:37 +08:00 committed by Max Reitz
parent f7640f0dbc
commit a77672ea3d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block/vmdk.c
View File

@ -47,6 +47,8 @@
#define VMDK4_FLAG_MARKER (1 << 17) #define VMDK4_FLAG_MARKER (1 << 17)
#define VMDK4_GD_AT_END 0xffffffffffffffffULL #define VMDK4_GD_AT_END 0xffffffffffffffffULL
#define VMDK_EXTENT_MAX_SECTORS (1ULL << 32)
#define VMDK_GTE_ZEROED 0x1 #define VMDK_GTE_ZEROED 0x1
/* VMDK internal error codes */ /* VMDK internal error codes */
@ -1250,6 +1252,10 @@ static int get_cluster_offset(BlockDriverState *bs,
return zeroed ? VMDK_ZEROED : VMDK_UNALLOC; return zeroed ? VMDK_ZEROED : VMDK_UNALLOC;
} }
if (extent->next_cluster_sector >= VMDK_EXTENT_MAX_SECTORS) {
return VMDK_ERROR;
}
cluster_sector = extent->next_cluster_sector; cluster_sector = extent->next_cluster_sector;
extent->next_cluster_sector += extent->cluster_sectors; extent->next_cluster_sector += extent->cluster_sectors;