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

Kernel: Use try in sys$mmap() and friends :^)

Browse source
This commit is contained in:
Andreas Kling 2021-09-05 14:27:41 +02:00
parent 6bf901b414
commit 36efecf3c3
1 changed files with 26 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

97
Kernel/Syscalls/mmap.cpp
View file

@ -162,10 +162,7 @@ KResultOr<FlatPtr> Process::sys$mmap(Userspace<const Syscall::SC_mmap_params*> u
if (params.name.characters) { if (params.name.characters) {
if (params.name.length > PATH_MAX) if (params.name.length > PATH_MAX)
return ENAMETOOLONG; return ENAMETOOLONG;
auto name_or_error = try_copy_kstring_from_user(params.name); name = TRY(try_copy_kstring_from_user(params.name));
if (name_or_error.is_error())
return name_or_error.error();
name = name_or_error.release_value();
} }
if (size == 0) if (size == 0)
@ -228,10 +225,8 @@ KResultOr<FlatPtr> Process::sys$mmap(Userspace<const Syscall::SC_mmap_params*> u
return maybe_vmobject.error(); return maybe_vmobject.error();
vmobject = maybe_vmobject.release_value(); vmobject = maybe_vmobject.release_value();
} }
auto region_or_error = address_space().allocate_region_with_vmobject(range.value(), vmobject.release_nonnull(), 0, {}, prot, map_shared);
if (region_or_error.is_error()) region = TRY(address_space().allocate_region_with_vmobject(range.value(), vmobject.release_nonnull(), 0, {}, prot, map_shared));
return region_or_error.error().error();
region = region_or_error.value();
} else { } else {
if (offset < 0) if (offset < 0)
return EINVAL; return EINVAL;
@ -254,10 +249,7 @@ KResultOr<FlatPtr> Process::sys$mmap(Userspace<const Syscall::SC_mmap_params*> u
return EACCES; return EACCES;
} }
auto region_or_error = description->mmap(*this, range.value(), static_cast<u64>(offset), prot, map_shared); region = TRY(description->mmap(*this, range.value(), static_cast<u64>(offset), prot, map_shared));
if (region_or_error.is_error())
return region_or_error.error().error();
region = region_or_error.value();
} }
if (!region) if (!region)
@ -301,11 +293,7 @@ KResultOr<FlatPtr> Process::sys$mprotect(Userspace<void*> addr, size_t size, int
REQUIRE_PROMISE(prot_exec); REQUIRE_PROMISE(prot_exec);
} }
auto range_or_error = expand_range_to_page_boundaries(addr, size); auto range_to_mprotect = TRY(expand_range_to_page_boundaries(addr, size));
if (range_or_error.is_error())
return range_or_error.error();
auto range_to_mprotect = range_or_error.value();
if (!range_to_mprotect.size()) if (!range_to_mprotect.size())
return EINVAL; return EINVAL;
@ -353,26 +341,20 @@ KResultOr<FlatPtr> Process::sys$mprotect(Userspace<void*> addr, size_t size, int
// This vector is the region(s) adjacent to our range. // This vector is the region(s) adjacent to our range.
// We need to allocate a new region for the range we wanted to change permission bits on. // We need to allocate a new region for the range we wanted to change permission bits on.
auto adjacent_regions_or_error = address_space().try_split_region_around_range(*region, range_to_mprotect); auto adjacent_regions = TRY(address_space().try_split_region_around_range(*region, range_to_mprotect));
if (adjacent_regions_or_error.is_error())
return adjacent_regions_or_error.error();
auto& adjacent_regions = adjacent_regions_or_error.value();
size_t new_range_offset_in_vmobject = region->offset_in_vmobject() + (range_to_mprotect.base().get() - region->range().base().get()); size_t new_range_offset_in_vmobject = region->offset_in_vmobject() + (range_to_mprotect.base().get() - region->range().base().get());
auto new_region_or_error = address_space().try_allocate_split_region(*region, range_to_mprotect, new_range_offset_in_vmobject); auto new_region = TRY(address_space().try_allocate_split_region(*region, range_to_mprotect, new_range_offset_in_vmobject));
if (new_region_or_error.is_error()) new_region->set_readable(prot & PROT_READ);
return new_region_or_error.error(); new_region->set_writable(prot & PROT_WRITE);
auto& new_region = *new_region_or_error.value(); new_region->set_executable(prot & PROT_EXEC);
new_region.set_readable(prot & PROT_READ);
new_region.set_writable(prot & PROT_WRITE);
new_region.set_executable(prot & PROT_EXEC);
// Map the new regions using our page directory (they were just allocated and don't have one). // Map the new regions using our page directory (they were just allocated and don't have one).
for (auto* adjacent_region : adjacent_regions) { for (auto* adjacent_region : adjacent_regions) {
if (!adjacent_region->map(address_space().page_directory())) if (!adjacent_region->map(address_space().page_directory()))
return ENOMEM; return ENOMEM;
} }
if (!new_region.map(address_space().page_directory())) if (!new_region->map(address_space().page_directory()))
return ENOMEM; return ENOMEM;
return 0; return 0;
} }
@ -418,30 +400,24 @@ KResultOr<FlatPtr> Process::sys$mprotect(Userspace<void*> addr, size_t size, int
// This vector is the region(s) adjacent to our range. // This vector is the region(s) adjacent to our range.
// We need to allocate a new region for the range we wanted to change permission bits on. // We need to allocate a new region for the range we wanted to change permission bits on.
auto adjacent_regions_or_error = address_space().try_split_region_around_range(*old_region, intersection_to_mprotect); auto adjacent_regions = TRY(address_space().try_split_region_around_range(*old_region, intersection_to_mprotect));
if (adjacent_regions_or_error.is_error())
return adjacent_regions_or_error.error();
auto& adjacent_regions = adjacent_regions_or_error.value();
// there should only be one // there should only be one
VERIFY(adjacent_regions.size() == 1); VERIFY(adjacent_regions.size() == 1);
size_t new_range_offset_in_vmobject = old_region->offset_in_vmobject() + (intersection_to_mprotect.base().get() - old_region->range().base().get()); size_t new_range_offset_in_vmobject = old_region->offset_in_vmobject() + (intersection_to_mprotect.base().get() - old_region->range().base().get());
auto new_region_or_error = address_space().try_allocate_split_region(*region, intersection_to_mprotect, new_range_offset_in_vmobject); auto* new_region = TRY(address_space().try_allocate_split_region(*region, intersection_to_mprotect, new_range_offset_in_vmobject));
if (new_region_or_error.is_error())
return new_region_or_error.error();
auto& new_region = *new_region_or_error.value(); new_region->set_readable(prot & PROT_READ);
new_region.set_readable(prot & PROT_READ); new_region->set_writable(prot & PROT_WRITE);
new_region.set_writable(prot & PROT_WRITE); new_region->set_executable(prot & PROT_EXEC);
new_region.set_executable(prot & PROT_EXEC);
// Map the new region using our page directory (they were just allocated and don't have one) if any. // 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.size())
if (!adjacent_regions[0]->map(address_space().page_directory())) if (!adjacent_regions[0]->map(address_space().page_directory()))
return ENOMEM; return ENOMEM;
if (!new_region.map(address_space().page_directory())) if (!new_region->map(address_space().page_directory()))
return ENOMEM; return ENOMEM;
} }
@ -456,11 +432,7 @@ KResultOr<FlatPtr> Process::sys$madvise(Userspace<void*> address, size_t size, i
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this) VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
REQUIRE_PROMISE(stdio); REQUIRE_PROMISE(stdio);
auto range_or_error = expand_range_to_page_boundaries(address, size); auto range_to_madvise = TRY(expand_range_to_page_boundaries(address, size));
if (range_or_error.is_error())
return range_or_error.error();
auto range_to_madvise = range_or_error.value();
if (!range_to_madvise.size()) if (!range_to_madvise.size())
return EINVAL; return EINVAL;
@ -504,16 +476,8 @@ KResultOr<FlatPtr> Process::sys$set_mmap_name(Userspace<const Syscall::SC_set_mm
if (params.name.length > PATH_MAX) if (params.name.length > PATH_MAX)
return ENAMETOOLONG; return ENAMETOOLONG;
auto name_or_error = try_copy_kstring_from_user(params.name); auto name = TRY(try_copy_kstring_from_user(params.name));
if (name_or_error.is_error()) auto range = TRY(expand_range_to_page_boundaries((FlatPtr)params.addr, params.size));
return name_or_error.error();
auto name = name_or_error.release_value();
auto range_or_error = expand_range_to_page_boundaries((FlatPtr)params.addr, params.size);
if (range_or_error.is_error())
return range_or_error.error();
auto range = range_or_error.value();
auto* region = address_space().find_region_from_range(range); auto* region = address_space().find_region_from_range(range);
if (!region) if (!region)
@ -547,11 +511,7 @@ KResultOr<FlatPtr> Process::sys$mremap(Userspace<const Syscall::SC_mremap_params
if (!copy_from_user(&params, user_params)) if (!copy_from_user(&params, user_params))
return EFAULT; return EFAULT;
auto range_or_error = expand_range_to_page_boundaries((FlatPtr)params.old_address, params.old_size); auto old_range = TRY(expand_range_to_page_boundaries((FlatPtr)params.old_address, params.old_size));
if (range_or_error.is_error())
return range_or_error.error().error();
auto old_range = range_or_error.value();
auto* old_region = address_space().find_region_from_range(old_range); auto* old_region = address_space().find_region_from_range(old_range);
if (!old_region) if (!old_region)
@ -576,12 +536,9 @@ KResultOr<FlatPtr> Process::sys$mremap(Userspace<const Syscall::SC_mremap_params
old_region->unmap(Memory::Region::ShouldDeallocateVirtualRange::No); old_region->unmap(Memory::Region::ShouldDeallocateVirtualRange::No);
address_space().deallocate_region(*old_region); address_space().deallocate_region(*old_region);
auto new_region_or_error = address_space().allocate_region_with_vmobject(range, new_vmobject.release_nonnull(), old_offset, old_name->view(), old_prot, false); auto new_region = TRY(address_space().allocate_region_with_vmobject(range, new_vmobject.release_nonnull(), old_offset, old_name->view(), old_prot, false));
if (new_region_or_error.is_error()) new_region->set_mmap(true);
return new_region_or_error.error().error(); return new_region->vaddr().get();
auto& new_region = *new_region_or_error.value();
new_region.set_mmap(true);
return new_region.vaddr().get();
} }
dbgln("sys$mremap: Unimplemented remap request (flags={})", params.flags); dbgln("sys$mremap: Unimplemented remap request (flags={})", params.flags);
@ -619,11 +576,9 @@ KResultOr<FlatPtr> Process::sys$allocate_tls(Userspace<const char*> initial_data
if (!range.has_value()) if (!range.has_value())
return ENOMEM; return ENOMEM;
auto region_or_error = address_space().allocate_region(range.value(), String("Master TLS"), PROT_READ | PROT_WRITE); auto region = TRY(address_space().allocate_region(range.value(), String("Master TLS"), PROT_READ | PROT_WRITE));
if (region_or_error.is_error())
return region_or_error.error().error();
m_master_tls_region = region_or_error.value()->make_weak_ptr(); m_master_tls_region = region->make_weak_ptr();
m_master_tls_size = size; m_master_tls_size = size;
m_master_tls_alignment = PAGE_SIZE; m_master_tls_alignment = PAGE_SIZE;