RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 22:17:42 +00:00
Code Issues Activity Actions

Kernel: Make PrivateInodeVMObject factory APIs OOM safe

Browse source
This commit is contained in:
Brian Gianforcaro 2021-05-28 03:18:07 -07:00 • committed by Andreas Kling
parent d947253c51
commit 65d5f81afc
4 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/Syscalls/mmap.cpp
View file

@ -632,14 +632,16 @@ KResultOr<FlatPtr> Process::sys$mremap(Userspace<const Syscall::SC_mremap_params
auto old_offset = old_region->offset_in_vmobject(); auto old_offset = old_region->offset_in_vmobject();
NonnullRefPtr inode = static_cast<SharedInodeVMObject&>(old_region->vmobject()).inode(); NonnullRefPtr inode = static_cast<SharedInodeVMObject&>(old_region->vmobject()).inode();
auto new_vmobject = PrivateInodeVMObject::create_with_inode(inode);
if (!new_vmobject)
return ENOMEM;
// Unmap without deallocating the VM range since we're going to reuse it. // Unmap without deallocating the VM range since we're going to reuse it.
old_region->unmap(Region::ShouldDeallocateVirtualMemoryRange::No); old_region->unmap(Region::ShouldDeallocateVirtualMemoryRange::No);
bool success = space().deallocate_region(*old_region); bool success = space().deallocate_region(*old_region);
VERIFY(success); VERIFY(success);
auto new_vmobject = PrivateInodeVMObject::create_with_inode(inode); auto new_region_or_error = space().allocate_region_with_vmobject(range, new_vmobject.release_nonnull(), old_offset, old_name, old_prot, false);
auto new_region_or_error = space().allocate_region_with_vmobject(range, new_vmobject, old_offset, old_name, old_prot, false);
if (new_region_or_error.is_error()) if (new_region_or_error.is_error())
return new_region_or_error.error().error(); return new_region_or_error.error().error();
auto& new_region = *new_region_or_error.value(); auto& new_region = *new_region_or_error.value();

5
Kernel/Syscalls/ptrace.cpp
View file

@ -201,7 +201,10 @@ KResult Process::poke_user_data(Userspace<u32*> address, u32 data)
// If the region is shared, we change its vmobject to a PrivateInodeVMObject // If the region is shared, we change its vmobject to a PrivateInodeVMObject
// to prevent the write operation from changing any shared inode data // to prevent the write operation from changing any shared inode data
VERIFY(region->vmobject().is_shared_inode()); VERIFY(region->vmobject().is_shared_inode());
region->set_vmobject(PrivateInodeVMObject::create_with_inode(static_cast<SharedInodeVMObject&>(region->vmobject()).inode())); auto vmobject = PrivateInodeVMObject::create_with_inode(static_cast<SharedInodeVMObject&>(region->vmobject()).inode());
if (!vmobject)
return ENOMEM;
region->set_vmobject(vmobject.release_nonnull());
region->set_shared(false); region->set_shared(false);
} }
const bool was_writable = region->is_writable(); const bool was_writable = region->is_writable();

6
Kernel/VM/PrivateInodeVMObject.cpp
View file

@ -9,14 +9,14 @@
namespace Kernel { namespace Kernel {
NonnullRefPtr<PrivateInodeVMObject> PrivateInodeVMObject::create_with_inode(Inode& inode) RefPtr<PrivateInodeVMObject> PrivateInodeVMObject::create_with_inode(Inode& inode)
{ {
return adopt_ref(*new PrivateInodeVMObject(inode, inode.size())); return adopt_ref_if_nonnull(new PrivateInodeVMObject(inode, inode.size()));
} }
RefPtr<VMObject> PrivateInodeVMObject::clone() RefPtr<VMObject> PrivateInodeVMObject::clone()
{ {
return adopt_ref(*new PrivateInodeVMObject(*this)); return adopt_ref_if_nonnull(new PrivateInodeVMObject(*this));
} }
PrivateInodeVMObject::PrivateInodeVMObject(Inode& inode, size_t size) PrivateInodeVMObject::PrivateInodeVMObject(Inode& inode, size_t size)

2
Kernel/VM/PrivateInodeVMObject.h
View file

@ -18,7 +18,7 @@ class PrivateInodeVMObject final : public InodeVMObject {
public: public:
virtual ~PrivateInodeVMObject() override; virtual ~PrivateInodeVMObject() override;
static NonnullRefPtr<PrivateInodeVMObject> create_with_inode(Inode&); static RefPtr<PrivateInodeVMObject> create_with_inode(Inode&);
virtual RefPtr<VMObject> clone() override; virtual RefPtr<VMObject> clone() override;
private: private: