External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-02 11:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: vhost_user: common: Fix memory access

Browse Source 
It was incorrect to call Vec::from_raw_parts() on the address pointing
to the shared memory log region since Vec is a Rust specific structure
that doesn't directly translate into bytes. That's why we use the same
function from std::slice in order to create a proper slice out of the
memory region, which is then copied into a Vec.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2021-08-06 15:13:08 +02:00 committed by Bo Chen
parent adae986233
commit 2c54c30435
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
virtio-devices/src/vhost_user/vu_common_ctrl.rs
View File

@ -457,8 +457,7 @@ impl VhostUserHandle {
// Make sure we hold onto the region to prevent the mapping from being
// released.
let old_region = self.shm_log.take();
self.shm_log = Some(Arc::new(region));
let old_region = self.shm_log.replace(Arc::new(region));
// Send the shm_log fd over to the backend
let log = VhostUserDirtyLogRegion {
@ -537,12 +536,14 @@ impl VhostUserHandle {
// region. The previous region is returned and processed to create the
// bitmap representing the dirty pages.
if let Some(region) = self.update_log_base(last_ram_addr)? {
// Cast the pointer to u64
let ptr = region.as_ptr() as *mut u64;
// Be careful with the size, as it was based on u8, meaning we must
// divide it by 8.
let len = region.size() / 8;
let bitmap = unsafe { Vec::from_raw_parts(ptr, len, len) };
let bitmap = unsafe {
// Cast the pointer to u64
let ptr = region.as_ptr() as *const u64;
std::slice::from_raw_parts(ptr, len).to_vec()
};
Ok(MemoryRangeTable::from_bitmap(bitmap, 0))
} else {
Err(Error::MissingShmLogRegion)