RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 01:57:45 +00:00
Code Issues Activity Actions

UserspaceEmulator: Handle MAP_FIXED with invalid addresses better

Browse source 
Old behavior: Crash due to VERIFY, unless we're completely and entirely out of
memory (m_available_ranges being empty), in which case it would return -ENOMEM.

New behavior: Return ENOMEM (and don't crash). In the case of nullptr,
also emit a helpful diagnostic.

Note that MAP_FIXED with nullptr is technically okay, but tends to be a sign
that something went wrong.

Also, this should improve mmap performance marginally, as it pulls the check out
of a loop that does not modify any parts of the check.

UE is now self-hosting! Fixes #5709.

However, this still needs some love: "ue UserspaceEmulator true" spits out tons
of error messages, probably false-positives, and takes about 229 seconds to run.
Then again, true-in-ue-in-ue-in-Qemu is three levels of emulation, so no wonder
it takes a long time! :D
This commit is contained in:
Ben Wiederhake 2021-03-10 17:59:05 +01:00 • committed by Andreas Kling
parent 22d9bd0c45
commit 292871c4bc
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/DevTools/UserspaceEmulator/RangeAllocator.cpp
View file

@ -149,9 +149,12 @@ Optional<Range> RangeAllocator::allocate_specific(VirtualAddress base, size_t si
VERIFY((size % PAGE_SIZE) == 0);
Range allocated_range(base, size);
if (!m_total_range.contains(allocated_range)) {
dbgln("Unallocatable mmap request?! {:p}+{:p}", base.get(), size);
return {};
}
for (size_t i = 0; i < m_available_ranges.size(); ++i) {
auto& available_range = m_available_ranges[i];
VERIFY(m_total_range.contains(allocated_range));
if (!available_range.contains(base, size))
continue;
if (available_range == allocated_range) {