From 5a94e8dfd0f8dbd0cff64c209aa6be5e8dc03c5d Mon Sep 17 00:00:00 2001
From: Liav A <liavalb@gmail.com>
Date: Thu, 6 Apr 2023 05:57:57 +0300
Subject: [PATCH] Kernel: Ensure jailed processes can be reaped by a jailed
 parent process

We were detaching from the jail process list too early. To ensure we
detach properly, leverage the remove_from_secondary_lists method
so the possibly jailed parent process can still see the dying process
and therefore clean it properly.
---
 Kernel/Process.cpp | 18 +++++++++++-------
 Kernel/Process.h   |  2 ++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp
index 7fee2b8cd87..ea7fbacc982 100644
--- a/Kernel/Process.cpp
+++ b/Kernel/Process.cpp
@@ -785,13 +785,6 @@ void Process::finalize()
     m_fds.with_exclusive([](auto& fds) { fds.clear(); });
     with_mutable_protected_data([&](auto& protected_data) { protected_data.tty = nullptr; });
     m_executable.with([](auto& executable) { executable = nullptr; });
-    m_jail_process_list.with([this](auto& list_ptr) {
-        if (list_ptr) {
-            list_ptr->attached_processes().with([&](auto& list) {
-                list.remove(*this);
-            });
-        }
-    });
     m_attached_jail.with([](auto& jail) {
         if (jail)
             jail->detach({});
@@ -845,6 +838,17 @@ void Process::unblock_waiters(Thread::WaitBlocker::UnblockFlags flags, u8 signal
         waiter_process->m_wait_blocker_set.unblock(*this, flags, signal);
 }
 
+void Process::remove_from_secondary_lists()
+{
+    m_jail_process_list.with([this](auto& list_ptr) {
+        if (list_ptr) {
+            list_ptr->attached_processes().with([&](auto& list) {
+                list.remove(*this);
+            });
+        }
+    });
+}
+
 void Process::die()
 {
     auto expected = State::Running;
diff --git a/Kernel/Process.h b/Kernel/Process.h
index 294228e3e4d..09798c2da65 100644
--- a/Kernel/Process.h
+++ b/Kernel/Process.h
@@ -204,6 +204,8 @@ public:
 
     ~Process();
 
+    virtual void remove_from_secondary_lists();
+
     ErrorOr<NonnullRefPtr<Thread>> create_kernel_thread(void (*entry)(void*), void* entry_data, u32 priority, NonnullOwnPtr<KString> name, u32 affinity = THREAD_AFFINITY_DEFAULT, bool joinable = true);
 
     bool is_profiling() const { return m_profiling; }