External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-06-30 15:02:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

vhdx: Avoid unwrap() of invalid header

Browse Source 
In the original code:

If the first header was invalid and the second header had the same
sequence number (zero) then the invalid first header would be returned.

The new code is more Rust idiomatic and avoids this situation.

See: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=48858

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-07-08 09:21:46 +01:00
parent b132cd2145
commit e300c3dcf7
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vhdx/src/vhdx_header.rs
View File

@ -397,26 +397,20 @@ impl VhdxHeader {
header_1: Result<Header>,
header_2: Result<Header>,
) -> Result<(HeaderNo, Header)> {
let mut header1_seq_num: u64 = 0;
let mut header2_seq_num: u64 = 0;
let mut valid_hdr_found: bool = false;
let header_1 = header_1.ok();
let header_2 = header_2.ok();
if let Ok(ref header_1) = header_1 {
valid_hdr_found = true;
header1_seq_num = header_1.sequence_number;
}
if let Ok(ref header_2) = header_2 {
valid_hdr_found = true;
header2_seq_num = header_2.sequence_number;
}
if !valid_hdr_found {
Err(VhdxHeaderError::NoValidHeader)
} else if header1_seq_num >= header2_seq_num {
Ok((HeaderNo::First, header_1.unwrap()))
} else {
Ok((HeaderNo::Second, header_2.unwrap()))
match (header_1, header_2) {
(None, None) => Err(VhdxHeaderError::NoValidHeader),
(Some(header_1), None) => Ok((HeaderNo::First, header_1)),
(None, Some(header_2)) => Ok((HeaderNo::Second, header_2)),
(Some(header_1), Some(header_2)) => {
if header_1.sequence_number >= header_2.sequence_number {
Ok((HeaderNo::First, header_1))
} else {
Ok((HeaderNo::Second, header_2))
}
}
}
}