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

misc: tdx: make tdx_init_memory_region() unsafe

Browse Source 
It takes a pointer to a userspace address that it accesses, so it should
be marked unsafe.  This was missed earlier.

Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
This commit is contained in:
Demi Marie Obenour
2025-06-27 22:08:26 -04:00
committed by Rob Bradford
parent 021f450cdb
commit 969a3b57a3
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hypervisor/src/kvm/mod.rs
View File

@@ -1020,11 +1020,13 @@ impl vm::Vm for KvmVm {
.map_err(vm::HypervisorVmError::FinalizeTdx)
}
///
/// Initialize memory regions for the TDX VM
///
/// # Safety
///
/// `host_address` must be valid for `size` bytes
#[cfg(feature = "tdx")]
fn tdx_init_memory_region(
unsafe fn tdx_init_memory_region(
&self,
host_address: *mut u8,
guest_address: u64,

6
hypervisor/src/vm.rs
View File

@@ -401,7 +401,11 @@ pub trait Vm: Send + Sync + Any {
}
#[cfg(feature = "tdx")]
/// Initialize a TDX memory region for this VM
fn tdx_init_memory_region(
///
/// # Safety
///
/// `_host_address` must be valid for `_size` bytes
unsafe fn tdx_init_memory_region(
&self,
_host_address: *mut u8,
_guest_address: u64,

18
vmm/src/vm.rs
View File

@@ -2249,15 +2249,23 @@ impl Vm {
let mem = guest_memory.memory();
for section in sections {
self.vm
.tdx_init_memory_region(
mem.get_host_address(GuestAddress(section.address)).unwrap(),
let size = section.size.try_into().unwrap();
// SAFETY: get_host_address_range does proper bounds checking
unsafe {
self.vm.tdx_init_memory_region(
virtio_devices::get_host_address_range(
&*mem,
GuestAddress(section.address),
size,
)
.unwrap(),
section.address,
section.size.try_into().unwrap(),
size,
/* TDVF_SECTION_ATTRIBUTES_EXTENDMR */
section.attributes == 1,
)
.map_err(Error::InitializeTdxMemoryRegion)?;
}
.map_err(Error::InitializeTdxMemoryRegion)?;
}
Ok(())