Skip to content

File offsets should be u64, not usize #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Dr-Emann wants to merge 2 commits into from
Closed

File offsets should be u64, not usize #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f85c33f
File offsets should be u64, not usize
Dr-Emann Apr 18, 2018
4af653f
Test large offsets in `map_offset` test
Dr-Emann Apr 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use std::ops::{Deref, DerefMut};
/// `MmapOptions::map_exec`, or `MmapOptions::map_copy`.
#[derive(Clone, Debug, Default)]
pub struct MmapOptions {
offset: usize,
offset: u64,
len: Option<usize>,
stack: bool,
}
Expand Down Expand Up @@ -86,7 +86,7 @@ impl MmapOptions {
/// # }
/// # fn main() { try_main().unwrap(); }
/// ```
pub fn offset(&mut self, offset: usize) -> &mut Self {
pub fn offset(&mut self, offset: u64) -> &mut Self {
self.offset = offset;
self
}
Expand Down Expand Up @@ -123,13 +123,14 @@ impl MmapOptions {
fn get_len(&self, file: &File) -> Result<usize> {
self.len.map(Ok).unwrap_or_else(|| {
let len = file.metadata()?.len();
let len = len - self.offset;
if len > (usize::MAX as u64) {
return Err(Error::new(
ErrorKind::InvalidData,
"file length overflows usize",
));
}
Ok(len as usize - self.offset)
Ok(len as usize)
})
}

Expand Down Expand Up @@ -829,12 +830,20 @@ mod test {
.open(&path)
.unwrap();

file.set_len(500000 as u64).unwrap();
let offset = u32::max_value() as u64 + 2;
let len = 5432;
file.set_len(offset + len as u64).unwrap();

let offset = 5099;
let len = 50050;

// Test both auto-length and explicit length
let mut mmap = unsafe {
MmapOptions::new()
.offset(offset)
.map_mut(&file)
.unwrap()
};
assert_eq!(len, mmap.len());
mmap = unsafe {
MmapOptions::new()
.offset(offset)
.len(len)
Expand Down
14 changes: 7 additions & 7 deletions src/unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ impl MmapInner {
prot: libc::c_int,
flags: libc::c_int,
file: RawFd,
offset: usize,
offset: u64,
) -> io::Result<MmapInner> {
let alignment = offset % page_size();
let aligned_offset = offset - alignment;
let alignment = (offset % page_size() as u64) as usize;
let aligned_offset = offset - alignment as u64;
let aligned_len = len + alignment;
if aligned_len == 0 {
// Normally the OS would catch this, but it segfaults under QEMU.
Expand Down Expand Up @@ -60,7 +60,7 @@ impl MmapInner {
}
}

pub fn map(len: usize, file: &File, offset: usize) -> io::Result<MmapInner> {
pub fn map(len: usize, file: &File, offset: u64) -> io::Result<MmapInner> {
MmapInner::new(
len,
libc::PROT_READ,
Expand All @@ -70,7 +70,7 @@ impl MmapInner {
)
}

pub fn map_exec(len: usize, file: &File, offset: usize) -> io::Result<MmapInner> {
pub fn map_exec(len: usize, file: &File, offset: u64) -> io::Result<MmapInner> {
MmapInner::new(
len,
libc::PROT_READ | libc::PROT_EXEC,
Expand All @@ -80,7 +80,7 @@ impl MmapInner {
)
}

pub fn map_mut(len: usize, file: &File, offset: usize) -> io::Result<MmapInner> {
pub fn map_mut(len: usize, file: &File, offset: u64) -> io::Result<MmapInner> {
MmapInner::new(
len,
libc::PROT_READ | libc::PROT_WRITE,
Expand All @@ -90,7 +90,7 @@ impl MmapInner {
)
}

pub fn map_copy(len: usize, file: &File, offset: usize) -> io::Result<MmapInner> {
pub fn map_copy(len: usize, file: &File, offset: u64) -> io::Result<MmapInner> {
MmapInner::new(
len,
libc::PROT_READ | libc::PROT_WRITE,
Expand Down
16 changes: 8 additions & 8 deletions src/windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ impl MmapInner {
file: &File,
protect: DWORD,
access: DWORD,
offset: usize,
offset: u64,
len: usize,
copy: bool,
) -> io::Result<MmapInner> {
let alignment = offset % allocation_granularity();
let aligned_offset = offset - alignment;
let alignment = (offset % allocation_granularity() as u64) as usize;
let aligned_offset = offset - alignment as u64;
let aligned_len = len + alignment;

unsafe {
Expand All @@ -70,7 +70,7 @@ impl MmapInner {
let ptr = MapViewOfFile(
handle,
access,
(aligned_offset >> 16 >> 16) as DWORD,
(aligned_offset >> 32) as DWORD,
(aligned_offset & 0xffffffff) as DWORD,
aligned_len as SIZE_T,
);
Expand All @@ -89,7 +89,7 @@ impl MmapInner {
}
}

pub fn map(len: usize, file: &File, offset: usize) -> io::Result<MmapInner> {
pub fn map(len: usize, file: &File, offset: u64) -> io::Result<MmapInner> {
let write = protection_supported(file.as_raw_handle(), PAGE_READWRITE);
let exec = protection_supported(file.as_raw_handle(), PAGE_EXECUTE_READ);
let mut access = FILE_MAP_READ;
Expand All @@ -116,7 +116,7 @@ impl MmapInner {
Ok(inner)
}

pub fn map_exec(len: usize, file: &File, offset: usize) -> io::Result<MmapInner> {
pub fn map_exec(len: usize, file: &File, offset: u64) -> io::Result<MmapInner> {
let write = protection_supported(file.as_raw_handle(), PAGE_READWRITE);
let mut access = FILE_MAP_READ | FILE_MAP_EXECUTE;
let protection = if write {
Expand All @@ -133,7 +133,7 @@ impl MmapInner {
Ok(inner)
}

pub fn map_mut(len: usize, file: &File, offset: usize) -> io::Result<MmapInner> {
pub fn map_mut(len: usize, file: &File, offset: u64) -> io::Result<MmapInner> {
let exec = protection_supported(file.as_raw_handle(), PAGE_EXECUTE_READ);
let mut access = FILE_MAP_READ | FILE_MAP_WRITE;
let protection = if exec {
Expand All @@ -150,7 +150,7 @@ impl MmapInner {
Ok(inner)
}

pub fn map_copy(len: usize, file: &File, offset: usize) -> io::Result<MmapInner> {
pub fn map_copy(len: usize, file: &File, offset: u64) -> io::Result<MmapInner> {
let exec = protection_supported(file.as_raw_handle(), PAGE_EXECUTE_READWRITE);
let mut access = FILE_MAP_COPY;
let protection = if exec {
Expand Down