Close FDs not in _cleanup, but in exit

2020-07-23 12:58:28 +03:00
parent 85c64e7cf0
commit d8b41be80c
1 changed files with 8 additions and 7 deletions
@@ -254,13 +254,6 @@ void process_cleanup(struct process *proc) {
    _assert(proc->thread_count == 1);
    proc->flags |= PROC_EMPTY;
    kdebug("Cleaning up %d\n", proc->pid);
-    for (size_t i = 0; i < THREAD_MAX_FDS; ++i) {
-        if (proc->fds[i]) {
-            ofile_close(&proc->ioctx, proc->fds[i]);
-            proc->fds[i] = NULL;
-        }
-    }
-
    // Release userspace pages
    mm_space_release(proc);
 }
@@ -737,6 +730,14 @@ __attribute__((noreturn)) void sys_exit(int status) {
        thread_wait_io_clear(thr);
    }

+    // Close FDs even before being reaped
+    for (size_t i = 0; i < THREAD_MAX_FDS; ++i) {
+        if (proc->fds[i]) {
+            ofile_close(&proc->ioctx, proc->fds[i]);
+            proc->fds[i] = NULL;
+        }
+    }
+
    proc->exit_status = status;

    // Notify waitpid()ers