From e43939bcc6123e02314aa403eef94d5ace441f7f Mon Sep 17 00:00:00 2001
From: dzwdz
Date: Sun, 27 Aug 2023 02:06:32 +0200
Subject: ports: qbe, cproc :^)

---
 src/kernel/proc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/kernel/proc.c')

diff --git a/src/kernel/proc.c b/src/kernel/proc.c
index 3ef35c0..cd9db9b 100644
--- a/src/kernel/proc.c
+++ b/src/kernel/proc.c
@@ -349,10 +349,14 @@ void proc_tryreap(Proc *dead) {
 			if (parent->state != PS_WAITS4CHILDDEATH) {
 				return; /* don't reap yet */
 			}
+			uint32_t pid = proc_ns_id(parent->pns, dead);
+			if (parent->awaited_death.pid && parent->awaited_death.pid != pid) {
+				return; /* we're not The One */
+			}
 			if (parent->awaited_death.legacy) {
 				regs_savereturn(&parent->regs, dead->death_msg);
 			} else {
-				regs_savereturn(&parent->regs, proc_ns_id(parent->pns, dead));
+				regs_savereturn(&parent->regs, pid);
 				if (parent->awaited_death.out) {
 					struct sys_wait2 __user *out = parent->awaited_death.out;
 					struct sys_wait2 data;
-- 
cgit v1.2.3