RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 07:35:08 +00:00
Code Issues Activity Actions

Kernel: Make FileDescription::create() APIs OOM safe

Browse source
This commit is contained in:
Brian Gianforcaro 2021-05-11 03:55:20 -07:00 • committed by Andreas Kling
parent 11bd2002bb
commit 12ab0dcee0
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Kernel/FileSystem/FileDescription.cpp
View file

@ -27,25 +27,34 @@ namespace Kernel {
KResultOr<NonnullRefPtr<FileDescription>> FileDescription::create(Custody& custody) KResultOr<NonnullRefPtr<FileDescription>> FileDescription::create(Custody& custody)
{ {
auto description = adopt_ref(*new FileDescription(InodeFile::create(custody.inode()))); auto inode_file = InodeFile::create(custody.inode());
if (inode_file.is_error())
return inode_file.error();
auto description = adopt_ref_if_nonnull(new FileDescription(*inode_file.release_value()));
if (!description)
return ENOMEM;
description->m_custody = custody; description->m_custody = custody;
auto result = description->attach(); auto result = description->attach();
if (result.is_error()) { if (result.is_error()) {
dbgln_if(FILEDESCRIPTION_DEBUG, "Failed to create file description for custody: {}", result); dbgln_if(FILEDESCRIPTION_DEBUG, "Failed to create file description for custody: {}", result);
return result; return result;
} }
return description; return description.release_nonnull();
} }
KResultOr<NonnullRefPtr<FileDescription>> FileDescription::create(File& file) KResultOr<NonnullRefPtr<FileDescription>> FileDescription::create(File& file)
{ {
auto description = adopt_ref(*new FileDescription(file)); auto description = adopt_ref_if_nonnull(new FileDescription(file));
if (!description)
return ENOMEM;
auto result = description->attach(); auto result = description->attach();
if (result.is_error()) { if (result.is_error()) {
dbgln_if(FILEDESCRIPTION_DEBUG, "Failed to create file description for file: {}", result); dbgln_if(FILEDESCRIPTION_DEBUG, "Failed to create file description for file: {}", result);
return result; return result;
} }
return description; return description.release_nonnull();
} }
FileDescription::FileDescription(File& file) FileDescription::FileDescription(File& file)