chore: Update vm-memory to 0.12.2

To solve a cargo audit on vm-memory<=0.12.1 Signed-off-by: Patrick Roy <[email protected]>
firecracker-microvm · Sep 8, 2023 · 270bd27 · 270bd27
1 parent 59e3d08
commit 270bd27
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/utils/Cargo.toml b/src/utils/Cargo.toml
@@ -13,7 +13,7 @@ thiserror = "1.0.32"
 versionize = "0.1.10"
 versionize_derive = "0.1.5"
 vmm-sys-util = "0.11.0"
-vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-bitmap"] }
+vm-memory = { version = "0.12.2", features = ["backend-mmap", "backend-bitmap"] }
 
 net_gen = { path = "../net_gen" }
 

diff --git a/src/vmm/Cargo.toml b/src/vmm/Cargo.toml
@@ -14,7 +14,7 @@ kvm-bindings = { version = "0.6.0", features = ["fam-wrappers"] }
 kvm-ioctls = "0.12.0"
 lazy_static = "1.4.0"
 libc = "0.2.117"
-linux-loader = "0.8.1"
+linux-loader = "0.9.1"
 log = "0.4.17"
 rand = "0.8.5"
 serde = { version = "1.0.185", features = ["derive"] }

diff --git a/src/vmm/src/devices/virtio/block/io/async_io.rs b/src/vmm/src/devices/virtio/block/io/async_io.rs
@@ -107,7 +107,7 @@ impl<T> AsyncFileEngine<T> {
         user_data: T,
     ) -> Result<(), UserDataError<T, Error>> {
         let buf = match mem.get_slice(addr, count as usize) {
-            Ok(slice) => slice.as_ptr(),
+            Ok(slice) => slice.ptr_guard_mut().as_ptr(),
             Err(err) => {
                 return Err(UserDataError {
                     user_data,
@@ -144,7 +144,7 @@ impl<T> AsyncFileEngine<T> {
         user_data: T,
     ) -> Result<(), UserDataError<T, Error>> {
         let buf = match mem.get_slice(addr, count as usize) {
-            Ok(slice) => slice.as_ptr(),
+            Ok(slice) => slice.ptr_guard_mut().as_ptr(),
             Err(err) => {
                 return Err(UserDataError {
                     user_data,

diff --git a/src/vmm/src/devices/virtio/iovec.rs b/src/vmm/src/devices/virtio/iovec.rs
@@ -139,6 +139,7 @@ impl IoVecBuffer {
             // region in the GuestMemoryMmap.
             let iov_base = mem
                 .get_slice(desc.addr, desc.len as usize)?
+                .ptr_guard_mut()
                 .as_ptr()
                 .cast::<c_void>();
             vecs.push(iovec {
@@ -245,7 +246,7 @@ impl IoVecBufferMut {
             // vm-memory related information after converting down to iovecs.
             slice.bitmap().mark_dirty(0, desc.len as usize);
 
-            let iov_base = slice.as_ptr().cast::<c_void>();
+            let iov_base = slice.ptr_guard_mut().as_ptr().cast::<c_void>();
             vecs.push(iovec {
                 iov_base,
                 iov_len: desc.len as size_t,