beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 15:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Kernel: Plumb OOM propagation through Custody factory

Browse source 
Modify the Custody::create(..) API so it has the ability to propagate
OOM back to the caller.
This commit is contained in:
Brian Gianforcaro 2021-05-10 00:28:23 -07:00 committed by Andreas Kling
parent fb93535419
commit 0b7395848a
Notes: sideshowbarker 2024-07-18 18:23:22 +09:00 
Author: https://github.com/bgianfo
Commit: https://github.com/SerenityOS/serenity/commit/0b7395848a7
Pull-request: https://github.com/SerenityOS/serenity/pull/7004
3 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Kernel/FileSystem/Custody.h
View file

@ -11,6 +11,7 @@
#include <AK/String.h>
#include <Kernel/Forward.h>
#include <Kernel/Heap/SlabAllocator.h>
#include <Kernel/KResult.h>
namespace Kernel {
@ -19,9 +20,13 @@ namespace Kernel {
class Custody : public RefCounted<Custody> {
MAKE_SLAB_ALLOCATED(Custody)
public:
static NonnullRefPtr<Custody> create(Custody* parent, const StringView& name, Inode& inode, int mount_flags)
static KResultOr<NonnullRefPtr<Custody>> create(Custody* parent, const StringView& name, Inode& inode, int mount_flags)
{
return adopt_ref(*new Custody(parent, name, inode, mount_flags));
auto custody = new Custody(parent, name, inode, mount_flags);
if (!custody)
return ENOMEM;
return adopt_ref(*custody);
}
~Custody();

18
Kernel/FileSystem/VirtualFileSystem.cpp
View file

@ -130,6 +130,12 @@ bool VFS::mount_root(FS& file_system)
dmesgln("VFS: mounted root from {} ({})", file_system.class_name(), static_cast<FileBackedFS&>(file_system).file_description().absolute_path());
m_mounts.append(move(mount));
auto root_custody = Custody::create(nullptr, "", *m_root_inode, root_mount_flags);
if (root_custody.is_error())
return false;
m_root_custody = root_custody.release_value();
return true;
}
@ -381,7 +387,9 @@ KResultOr<NonnullRefPtr<FileDescription>> VFS::create(StringView path, int optio
return inode_or_error.error();
auto new_custody = Custody::create(&parent_custody, p.basename(), inode_or_error.value(), parent_custody.mount_flags());
auto description = FileDescription::create(*new_custody);
if (new_custody.is_error())
return new_custody.error();
auto description = FileDescription::create(*new_custody.release_value());
if (!description.is_error()) {
description.value()->set_rw_mode(options);
description.value()->set_file_flags(options);
@ -820,8 +828,6 @@ void VFS::sync()
Custody& VFS::root_custody()
{
if (!m_root_custody)
m_root_custody = Custody::create(nullptr, "", *m_root_inode, root_mount_flags);
return *m_root_custody;
}
@ -986,7 +992,11 @@ KResultOr<NonnullRefPtr<Custody>> VFS::resolve_path_without_veil(StringView path
mount_flags_for_child = mount->flags();
}
custody = Custody::create(&parent, part, *child_inode, mount_flags_for_child);
auto new_custody = Custody::create(&parent, part, *child_inode, mount_flags_for_child);
if (new_custody.is_error())
return new_custody.error();
custody = new_custody.release_value();
if (child_inode->metadata().is_symlink()) {
if (!have_more_parts) {

7
Kernel/Syscalls/chroot.cpp
View file

@ -25,7 +25,12 @@ KResultOr<int> Process::sys$chroot(Userspace<const char*> user_path, size_t path
auto directory = directory_or_error.value();
m_root_directory_relative_to_global_root = directory;
int chroot_mount_flags = mount_flags == -1 ? directory->mount_flags() : mount_flags;
set_root_directory(Custody::create(nullptr, "", directory->inode(), chroot_mount_flags));
auto custody = Custody::create(nullptr, "", directory->inode(), chroot_mount_flags);
if (custody.is_error())
return custody.error();
set_root_directory(custody.release_value());
return 0;
}