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

Kernel: Make ProcessGroup::find_or_create API OOM safe

Browse source 
Make ProcessGroup::find_or_create & ProcessGroup::create OOM safe, by
moving to adopt_ref_if_nonnull.
This commit is contained in:
Brian Gianforcaro 2021-05-18 02:07:25 -07:00 • committed by Andreas Kling
parent 7540f4268b
commit bb91bed576
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/ProcessGroup.cpp
View file

@ -17,10 +17,10 @@ ProcessGroup::~ProcessGroup()
g_process_groups->remove(this); g_process_groups->remove(this);
} }
NonnullRefPtr<ProcessGroup> ProcessGroup::create(ProcessGroupID pgid) RefPtr<ProcessGroup> ProcessGroup::create(ProcessGroupID pgid)
{ {
auto process_group = adopt_ref(*new ProcessGroup(pgid)); auto process_group = adopt_ref_if_nonnull(new ProcessGroup(pgid));
{ if (process_group) {
ScopedSpinLock lock(g_process_groups_lock); ScopedSpinLock lock(g_process_groups_lock);
g_process_groups->prepend(process_group); g_process_groups->prepend(process_group);
} }
@ -28,7 +28,7 @@ NonnullRefPtr<ProcessGroup> ProcessGroup::create(ProcessGroupID pgid)
return process_group; return process_group;
} }
NonnullRefPtr<ProcessGroup> ProcessGroup::find_or_create(ProcessGroupID pgid) RefPtr<ProcessGroup> ProcessGroup::find_or_create(ProcessGroupID pgid)
{ {
ScopedSpinLock lock(g_process_groups_lock); ScopedSpinLock lock(g_process_groups_lock);

4
Kernel/ProcessGroup.h
View file

@ -28,8 +28,8 @@ class ProcessGroup
public: public:
~ProcessGroup(); ~ProcessGroup();
static NonnullRefPtr<ProcessGroup> create(ProcessGroupID); static RefPtr<ProcessGroup> create(ProcessGroupID);
static NonnullRefPtr<ProcessGroup> find_or_create(ProcessGroupID); static RefPtr<ProcessGroup> find_or_create(ProcessGroupID);
static RefPtr<ProcessGroup> from_pgid(ProcessGroupID); static RefPtr<ProcessGroup> from_pgid(ProcessGroupID);
const ProcessGroupID& pgid() const { return m_pgid; } const ProcessGroupID& pgid() const { return m_pgid; }

3
Kernel/Syscalls/setpgid.cpp
View file

@ -116,6 +116,9 @@ KResultOr<int> Process::sys$setpgid(pid_t specified_pid, pid_t specified_pgid)
} }
// FIXME: There are more EPERM conditions to check for here.. // FIXME: There are more EPERM conditions to check for here..
process->m_pg = ProcessGroup::find_or_create(new_pgid); process->m_pg = ProcessGroup::find_or_create(new_pgid);
if (!process->m_pg) {
return ENOMEM;
}
return 0; return 0;
} }