diff options
Diffstat (limited to 'src/kernel/proc.c')
| -rw-r--r-- | src/kernel/proc.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/kernel/proc.c b/src/kernel/proc.c index ecbd839..3ef35c0 100644 --- a/src/kernel/proc.c +++ b/src/kernel/proc.c @@ -349,7 +349,18 @@ void proc_tryreap(Proc *dead) { if (parent->state != PS_WAITS4CHILDDEATH) { return; /* don't reap yet */ } - regs_savereturn(&parent->regs, dead->death_msg); + if (parent->awaited_death.legacy) { + regs_savereturn(&parent->regs, dead->death_msg); + } else { + regs_savereturn(&parent->regs, proc_ns_id(parent->pns, dead)); + if (parent->awaited_death.out) { + struct sys_wait2 __user *out = parent->awaited_death.out; + struct sys_wait2 data; + memset(&data, 0, sizeof data); + data.status = dead->death_msg; + pcpy_to(parent, out, &data, sizeof data); + } + } proc_setstate(parent, PS_RUNNING); } /* can't be reaped anymore */ |