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

vmm: fix UB in load_igvm(...)

Browse Source 
With the `mshv` feature enabled, the immutable `data` `Vec` is mutated
via a pointer. This violates Rust aliasing rules. Fixed by cloning the
`Vec` to a mutable instance when the `mshv` feature is active.

Signed-off-by: Julian Schindel <mail@arctic-alpaca.de>
This commit is contained in:
Julian Schindel
2026-04-29 21:55:06 +02:00
committed by Rob Bradford
parent 5f360abdc7
commit 9a0fb1b06a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vmm/src/igvm/igvm_loader.rs
View File

@@ -387,6 +387,11 @@ pub fn load_igvm(
data_type, data_type,
data, data,
} => { } => {
// With the "mshv" feature enabled, `data` is modified via pointer, so `data` needs
// to be mutable.
#[cfg(feature = "mshv")]
let mut data = data.clone();
debug_assert!((data.len() as u64).is_multiple_of(HV_PAGE_SIZE)); debug_assert!((data.len() as u64).is_multiple_of(HV_PAGE_SIZE));
// TODO: only 4k or empty page data supported right now // TODO: only 4k or empty page data supported right now
@@ -428,8 +433,7 @@ pub fn load_igvm(
if hypervisor_type == HypervisorType::Mshv { if hypervisor_type == HypervisorType::Mshv {
// SAFETY: CPUID is readonly // SAFETY: CPUID is readonly
unsafe { unsafe {
let cpuid_page_p: *mut hv_psp_cpuid_page = let cpuid_page_p = data.as_mut_ptr().cast();
data.as_ptr() as *mut hv_psp_cpuid_page; // as *mut hv_psp_cpuid_page;
let cpuid_page: &mut hv_psp_cpuid_page = &mut *cpuid_page_p; let cpuid_page: &mut hv_psp_cpuid_page = &mut *cpuid_page_p;
for i in 0..cpuid_page.count { for i in 0..cpuid_page.count {
let leaf = cpuid_page.cpuid_leaf_info[i as usize]; let leaf = cpuid_page.cpuid_leaf_info[i as usize];
@@ -557,7 +561,7 @@ pub fn load_igvm(
} }
if !imported_page { if !imported_page {
loader loader
.import_pages(gpa / HV_PAGE_SIZE, 1, acceptance, data) .import_pages(gpa / HV_PAGE_SIZE, 1, acceptance, data.as_ref())
.map_err(Error::Loader)?; .map_err(Error::Loader)?;
} }
} }