Skip to content
This repository was archived by the owner on Mar 24, 2022. It is now read-only.

When the heap is not page aligned, fail instead of lucet_bail #486

Merged
fst-crenshaw merged 7 commits into from
Apr 9, 2020
Merged

When the heap is not page aligned, fail instead of lucet_bail #486

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dd8d561
Fail instead of lucet_bail.
fst-crenshaw Apr 6, 2020
f6f2f46
Make diff smaller.
fst-crenshaw Apr 6, 2020
36bea13
Update lucet-runtime/lucet-runtime-internals/src/region/mmap.rs
fst-crenshaw Apr 6, 2020
c23f415
Delete that which is not needed.
fst-crenshaw Apr 6, 2020
910711e
Assert that the mod finds no remainder. Then there is alignment.
fst-crenshaw Apr 6, 2020
b1e8da2
Merge branch 'master' into tlc/fail-not-bail
fst-crenshaw Apr 6, 2020
1f9cc03
fmt.
fst-crenshaw Apr 6, 2020
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
8 changes: 5 additions & 3 deletions lucet-runtime/lucet-runtime-internals/src/region/mmap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,11 @@ impl RegionInternal for MmapRegion {
.pop()
.ok_or(Error::RegionFull(self.capacity))?;

if slot.heap as usize % host_page_size() != 0 {
lucet_bail!("heap is not page-aligned; this is a bug");
}
assert_eq!(
slot.heap as usize % host_page_size(),
0,
"heap must be page-aligned"
);

for (ptr, len) in [
// make the stack read/writable
Expand Down