summary refs log tree commit diff
path: root/sys_util/src/guest_memory.rs
diff options
context:
space:
mode:
authorDylan Reid <dgreid@chromium.org>2017-06-20 10:15:51 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-06-27 00:20:33 -0700
commit0584fe9fb2694fad6dc841a8215e8017c18b19c7 (patch)
tree0180ba9aaec5211b367b2656775a82dac2fe736f /sys_util/src/guest_memory.rs
parent045c7133dd22e4cc5fe62af136c15b04a8b8a485 (diff)
downloadcrosvm-0584fe9fb2694fad6dc841a8215e8017c18b19c7.tar
crosvm-0584fe9fb2694fad6dc841a8215e8017c18b19c7.tar.gz
crosvm-0584fe9fb2694fad6dc841a8215e8017c18b19c7.tar.bz2
crosvm-0584fe9fb2694fad6dc841a8215e8017c18b19c7.tar.lz
crosvm-0584fe9fb2694fad6dc841a8215e8017c18b19c7.tar.xz
crosvm-0584fe9fb2694fad6dc841a8215e8017c18b19c7.tar.zst
crosvm-0584fe9fb2694fad6dc841a8215e8017c18b19c7.zip
Limit types that can be read from guest memory
Not all types are safe to read from guest memory.  Any type with a
reference or pointer will be initialized to random bits that don't refer
to a valid address.  This can cause dangling pointer and general
unsafe behavior.

To fix this, limit types that can be read with read_obj to those that
implement the unsafe trait `DataInit`.  Provide implementations of
`DataInit` for intrinsic types that are obviously safe to initialize
with random data.

Implement the needed traits for bootparam types as they are read from
the kernel image directly.

Change-Id: I1040f5bc1b2fc4c58c87d8a2ce3f618edcf6f9b1
Signed-off-by: Dylan Reid <dgreid@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/540750
Reviewed-by: Zach Reizner <zachr@chromium.org>
Diffstat (limited to 'sys_util/src/guest_memory.rs')
-rw-r--r--sys_util/src/guest_memory.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys_util/src/guest_memory.rs b/sys_util/src/guest_memory.rs
index 0dfb709..f7ad298 100644
--- a/sys_util/src/guest_memory.rs
+++ b/sys_util/src/guest_memory.rs
@@ -8,6 +8,7 @@ use std::io::{Read, Write};
 use std::result;
 use std::sync::Arc;
 
+use data_model::DataInit;
 use guest_address::GuestAddress;
 use mmap::MemoryMapping;
 
@@ -160,7 +161,7 @@ impl GuestMemory {
     /// #     Ok(num1 + num2)
     /// # }
     /// ```
-    pub fn read_obj_from_addr<T: Copy>(&self, guest_addr: GuestAddress) -> Result<T> {
+    pub fn read_obj_from_addr<T: DataInit>(&self, guest_addr: GuestAddress) -> Result<T> {
         self.do_in_region(guest_addr, |mapping, offset| {
             mapping
                 .read_obj(offset)
@@ -183,7 +184,7 @@ impl GuestMemory {
     ///         .map_err(|_| ())
     /// # }
     /// ```
-    pub fn write_obj_at_addr<T>(&self, val: T, guest_addr: GuestAddress) -> Result<()> {
+    pub fn write_obj_at_addr<T: DataInit>(&self, val: T, guest_addr: GuestAddress) -> Result<()> {
         self.do_in_region(guest_addr, move |mapping, offset| {
             mapping
                 .write_obj(val, offset)