summary refs log tree commit diff
path: root/vm_control
diff options
context:
space:
mode:
authorDylan Reid <dgreid@chromium.org>2020-03-27 19:07:59 +0000
committerCommit Bot <commit-bot@chromium.org>2020-04-05 21:32:17 +0000
commit252d5b3cf3fd7a48fe9d610b59e3d6da9f2c6fe9 (patch)
treedc25f8bcc4d2923222a7552b999aede2ec321855 /vm_control
parent146450b4569e86657d1d8c4ffe17524781aae7e3 (diff)
downloadcrosvm-252d5b3cf3fd7a48fe9d610b59e3d6da9f2c6fe9.tar
crosvm-252d5b3cf3fd7a48fe9d610b59e3d6da9f2c6fe9.tar.gz
crosvm-252d5b3cf3fd7a48fe9d610b59e3d6da9f2c6fe9.tar.bz2
crosvm-252d5b3cf3fd7a48fe9d610b59e3d6da9f2c6fe9.tar.lz
crosvm-252d5b3cf3fd7a48fe9d610b59e3d6da9f2c6fe9.tar.xz
crosvm-252d5b3cf3fd7a48fe9d610b59e3d6da9f2c6fe9.tar.zst
crosvm-252d5b3cf3fd7a48fe9d610b59e3d6da9f2c6fe9.zip
handle mmap of large offsets on 32 bit systems
While only 32 bits of address can be mapped, that 32 bits can be offset
by further than 32 bits in to a large file. As chirantan points out, the
try_mmap call was already casting the usize to u64 on all architectures.

Convert the usize offset in mmap to u64 and address users of the API as
well.

Change-Id: I67aed928ea521049fb51eb7aa61ea4de8b4d096c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2124879
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Tested-by: Dylan Reid <dgreid@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Dylan Reid <dgreid@chromium.org>
Diffstat (limited to 'vm_control')
-rw-r--r--vm_control/src/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/vm_control/src/lib.rs b/vm_control/src/lib.rs
index cb836be..4d48ff4 100644
--- a/vm_control/src/lib.rs
+++ b/vm_control/src/lib.rs
@@ -235,7 +235,7 @@ pub enum VmMemoryRequest {
     RegisterMmapMemory {
         fd: MaybeOwnedFd,
         size: usize,
-        offset: usize,
+        offset: u64,
         gpa: u64,
     },
 }
@@ -303,7 +303,7 @@ impl VmMemoryRequest {
                 offset,
                 gpa,
             } => {
-                let mmap = match MemoryMapping::from_fd_offset(fd, size, offset) {
+                let mmap = match MemoryMapping::from_fd_offset(fd, size, offset as u64) {
                     Ok(v) => v,
                     Err(_e) => return VmMemoryResponse::Err(SysError::new(EINVAL)),
                 };