Kernel: Fix PID/TID confusion in send_signal

This fixes the issue of a specific type of unkillable processes.
Author: https://github.com/BenWiederhake Commit: https://github.com/SerenityOS/serenity/commit/083671ef2cc Pull-request: https://github.com/SerenityOS/serenity/pull/3057 Reviewed-by: https://github.com/alimpfard Reviewed-by: https://github.com/awesomekling Reviewed-by: https://github.com/bgianfo
2020-08-09 15:23:31 +02:00 · 2020-08-09 15:23:31 +02:00 · 083671ef2c · 2024-07-19 04:06:35 +09:00
commit 083671ef2c
parent bee08a4b9f
1 changed files with 14 additions and 3 deletions
--- a/Kernel/Process.cpp
+++ b/Kernel/Process.cpp
@ -790,9 +790,20 @@ void Process::terminate_due_to_signal(u8 signal)
 KResult Process::send_signal(u8 signal, Process* sender)
 {
    InterruptDisabler disabler;
-    // FIXME: PID/TID BUG
-    if (auto* thread = Thread::from_tid(m_pid.value())) {
-        thread->send_signal(signal, sender);
+    Thread* receiver_thread;
+    // Try to send it to the "obvious" main thread:
+    receiver_thread = Thread::from_tid(m_pid.value());
+    // If the main thread has died, there may still be other threads:
+    if (!receiver_thread) {
+        // The first one should be good enough.
+        // Neither kill(2) nor kill(3) specify any selection precedure.
+        for_each_thread([&receiver_thread](Thread& thread) -> IterationDecision {
+            receiver_thread = &thread;
+            return IterationDecision::Break;
+        });
+    }
+    if (receiver_thread) {
+        receiver_thread->send_signal(signal, sender);
        return KSuccess;
    }
    return KResult(-ESRCH);