kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

block: vhdx: reject zero size virtual disk

Browse Source 
Some calculation down the road depends on that value not being zero.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
Wei Liu
2025-01-06 18:40:48 +00:00
committed by Wei Liu
parent a2df4d7660
commit e6e78e5986
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
block/src/vhdx/vhdx_metadata.rs
+10
View File
@@ -55,6 +55,8 @@ const METADATA_LENGTH_MAX: u32 = 1 << 20; // 1 MiB
pub enum VhdxMetadataError { pub enum VhdxMetadataError {
#[error("Invalid block size count")] #[error("Invalid block size count")]
InvalidBlockSize, InvalidBlockSize,
#[error("Invalid disk size {0}")]
InvalidDiskSize(u64),
#[error("Invalid metadata entry count")] #[error("Invalid metadata entry count")]
InvalidEntryCount, InvalidEntryCount,
#[error("Invalid logical sector size")] #[error("Invalid logical sector size")]
@@ -214,6 +216,14 @@ impl DiskSpec {
if metadata_presence != METADATA_ALL_PRESENT { if metadata_presence != METADATA_ALL_PRESENT {
return Err(VhdxMetadataError::MissingMetadata); return Err(VhdxMetadataError::MissingMetadata);
} }
// Make sure virtual disk size is not zero
if (metadata_presence & METADATA_VIRTUAL_DISK_SIZE_PRESENT != 0)
&& disk_spec.virtual_disk_size == 0
{
return Err(VhdxMetadataError::InvalidDiskSize(
disk_spec.virtual_disk_size,
));
}
// Check if the virtual disk size is a multiple of the logical sector // Check if the virtual disk size is a multiple of the logical sector
// size. // size.
if ((metadata_presence & METADATA_LOGICAL_SECTOR_SIZE_PRESENT) != 0) if ((metadata_presence & METADATA_LOGICAL_SECTOR_SIZE_PRESENT) != 0)