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

Kernel: Make Memory::Region::map() return KResult

Browse source 
..and use TRY() at the call sites to propagate errors. :^)
This commit is contained in:
Andreas Kling 2021-09-06 12:52:23 +02:00
parent 7981422500
commit e3a716ceff
6 changed files with 17 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Kernel/Syscalls/fork.cpp
View file

@ -95,8 +95,7 @@ KResultOr<FlatPtr> Process::sys$fork(RegisterState& regs)
dbgln_if(FORK_DEBUG, "fork: cloning Region({}) '{}' @ {}", region, region->name(), region->vaddr());
auto region_clone = TRY(region->try_clone());
auto* child_region = TRY(child->address_space().add_region(move(region_clone)));
if (!child_region->map(child->address_space().page_directory(), Memory::ShouldFlushTLB::No))
return ENOMEM;
TRY(child_region->map(child->address_space().page_directory(), Memory::ShouldFlushTLB::No));
if (region == m_master_tls_region.unsafe_ptr())
child->m_master_tls_region = child_region;

12
Kernel/Syscalls/mmap.cpp
View file

@ -338,11 +338,9 @@ KResultOr<FlatPtr> Process::sys$mprotect(Userspace<void*> addr, size_t size, int
// Map the new regions using our page directory (they were just allocated and don't have one).
for (auto* adjacent_region : adjacent_regions) {
if (!adjacent_region->map(address_space().page_directory()))
return ENOMEM;
TRY(adjacent_region->map(address_space().page_directory()));
}
if (!new_region->map(address_space().page_directory()))
return ENOMEM;
TRY(new_region->map(address_space().page_directory()));
return 0;
}
@ -401,11 +399,9 @@ KResultOr<FlatPtr> Process::sys$mprotect(Userspace<void*> addr, size_t size, int
// Map the new region using our page directory (they were just allocated and don't have one) if any.
if (adjacent_regions.size())
if (!adjacent_regions[0]->map(address_space().page_directory()))
return ENOMEM;
TRY(adjacent_regions[0]->map(address_space().page_directory()));
if (!new_region->map(address_space().page_directory()))
return ENOMEM;
TRY(new_region->map(address_space().page_directory()));
}
return 0;