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

Kernel: Make InodeWatcher::crate API OOM safe

Browse source
This commit is contained in:
Brian Gianforcaro 2021-05-13 04:31:27 -07:00 • committed by Andreas Kling
parent c8758d4faa
commit 0d50d3ed1e
3 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Kernel/FileSystem/InodeWatcher.cpp
View file

@ -12,9 +12,12 @@
namespace Kernel {
NonnullRefPtr<InodeWatcher> InodeWatcher::create()
KResultOr<NonnullRefPtr<InodeWatcher>> InodeWatcher::create()
{
return adopt_ref(*new InodeWatcher);
auto watcher = adopt_ref_if_nonnull(new InodeWatcher);
if (watcher)
return watcher.release_nonnull();
return ENOMEM;
}
InodeWatcher::~InodeWatcher()
@ -120,7 +123,11 @@ KResultOr<int> InodeWatcher::register_inode(Inode& inode, unsigned event_mask)
m_wd_counter = 1;
} while (m_wd_to_watches.find(wd) != m_wd_to_watches.end());
auto description = WatchDescription::create(wd, inode, event_mask);
auto description_or_error = WatchDescription::create(wd, inode, event_mask);
if (description_or_error.is_error())
return description_or_error.error();
auto description = description_or_error.release_value();
m_inode_to_watches.set(inode.identifier(), description.ptr());
m_wd_to_watches.set(wd, move(description));