diff options
| -rw-r--r-- | Kernel/Memory/AddressSpace.cpp | 20 | ||||
| -rw-r--r-- | Kernel/Memory/AddressSpace.h | 2 | ||||
| -rw-r--r-- | Kernel/Syscalls/fork.cpp | 7 |
3 files changed, 9 insertions, 20 deletions
diff --git a/Kernel/Memory/AddressSpace.cpp b/Kernel/Memory/AddressSpace.cpp index 47ad3dc519..f28c3507fe 100644 --- a/Kernel/Memory/AddressSpace.cpp +++ b/Kernel/Memory/AddressSpace.cpp @@ -144,9 +144,7 @@ KResultOr<Region*> AddressSpace::try_allocate_split_region(Region const& source_ { auto new_region = TRY(Region::try_create_user_accessible( range, source_region.vmobject(), offset_in_vmobject, KString::try_create(source_region.name()), source_region.access(), source_region.is_cacheable() ? Region::Cacheable::Yes : Region::Cacheable::No, source_region.is_shared())); - auto* region = add_region(move(new_region)); - if (!region) - return ENOMEM; + auto* region = TRY(add_region(move(new_region))); region->set_syscall_region(source_region.is_syscall_region()); region->set_mmap(source_region.is_mmap()); region->set_stack(source_region.is_stack()); @@ -165,10 +163,7 @@ KResultOr<Region*> AddressSpace::allocate_region(VirtualRange const& range, Stri auto region = TRY(Region::try_create_user_accessible(range, move(vmobject), 0, KString::try_create(name), prot_to_region_access_flags(prot), Region::Cacheable::Yes, false)); if (!region->map(page_directory())) return ENOMEM; - auto* added_region = add_region(move(region)); - if (!added_region) - return ENOMEM; - return added_region; + return add_region(move(region)); } KResultOr<Region*> AddressSpace::allocate_region_with_vmobject(VirtualRange const& range, NonnullRefPtr<VMObject> vmobject, size_t offset_in_vmobject, StringView name, int prot, bool shared) @@ -189,9 +184,7 @@ KResultOr<Region*> AddressSpace::allocate_region_with_vmobject(VirtualRange cons } offset_in_vmobject &= PAGE_MASK; auto region = TRY(Region::try_create_user_accessible(range, move(vmobject), offset_in_vmobject, KString::try_create(name), prot_to_region_access_flags(prot), Region::Cacheable::Yes, shared)); - auto* added_region = add_region(move(region)); - if (!added_region) - return ENOMEM; + auto* added_region = TRY(add_region(move(region))); if (!added_region->map(page_directory())) return ENOMEM; return added_region; @@ -264,12 +257,13 @@ Vector<Region*> AddressSpace::find_regions_intersecting(VirtualRange const& rang return regions; } -Region* AddressSpace::add_region(NonnullOwnPtr<Region> region) +KResultOr<Region*> AddressSpace::add_region(NonnullOwnPtr<Region> region) { auto* ptr = region.ptr(); SpinlockLocker lock(m_lock); - auto success = m_regions.try_insert(region->vaddr().get(), move(region)); - return success ? ptr : nullptr; + if (!m_regions.try_insert(region->vaddr().get(), move(region))) + return ENOMEM; + return ptr; } // Carve out a virtual address range from a region and return the two regions on either side diff --git a/Kernel/Memory/AddressSpace.h b/Kernel/Memory/AddressSpace.h index 92b9de4d95..9617a54b1d 100644 --- a/Kernel/Memory/AddressSpace.h +++ b/Kernel/Memory/AddressSpace.h @@ -24,7 +24,7 @@ public: PageDirectory& page_directory() { return *m_page_directory; } const PageDirectory& page_directory() const { return *m_page_directory; } - Region* add_region(NonnullOwnPtr<Region>); + KResultOr<Region*> add_region(NonnullOwnPtr<Region>); size_t region_count() const { return m_regions.size(); } diff --git a/Kernel/Syscalls/fork.cpp b/Kernel/Syscalls/fork.cpp index 036170fc12..27e67b5313 100644 --- a/Kernel/Syscalls/fork.cpp +++ b/Kernel/Syscalls/fork.cpp @@ -94,12 +94,7 @@ KResultOr<FlatPtr> Process::sys$fork(RegisterState& regs) for (auto& region : address_space().regions()) { dbgln_if(FORK_DEBUG, "fork: cloning Region({}) '{}' @ {}", region, region->name(), region->vaddr()); auto region_clone = TRY(region->try_clone()); - auto* child_region = child->address_space().add_region(move(region_clone)); - if (!child_region) { - dbgln("fork: Cannot add region, insufficient memory"); - // TODO: tear down new process? - return ENOMEM; - } + 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; |