Author: kib
Date: Sun Mar 19 15:48:41 2017
New Revision: 315559
URL: https://svnweb.freebsd.org/changeset/base/315559
Log:
MFC r315159:
Avoid reusing p_ksi while it is on queue.
Modified:
stable/11/sys/kern/kern_exit.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/kern/kern_exit.c
==============================================================================
--- stable/11/sys/kern/kern_exit.c Sun Mar 19 15:46:25 2017
(r315558)
+++ stable/11/sys/kern/kern_exit.c Sun Mar 19 15:48:41 2017
(r315559)
@@ -189,6 +189,7 @@ exit1(struct thread *td, int rval, int s
{
struct proc *p, *nq, *q, *t;
struct thread *tdt;
+ ksiginfo_t *ksi, *ksi1;
mtx_assert(&Giant, MA_NOTOWNED);
KASSERT(rval == 0 || signo == 0, ("exit1 rv %d sig %d", rval, signo));
@@ -449,14 +450,32 @@ exit1(struct thread *td, int rval, int s
wakeup(q->p_reaper);
for (; q != NULL; q = nq) {
nq = LIST_NEXT(q, p_sibling);
+ ksi = ksiginfo_alloc(TRUE);
PROC_LOCK(q);
q->p_sigparent = SIGCHLD;
if (!(q->p_flag & P_TRACED)) {
proc_reparent(q, q->p_reaper);
if (q->p_state == PRS_ZOMBIE) {
+ /*
+ * Inform reaper about the reparented
+ * zombie, since wait(2) has something
+ * new to report. Guarantee queueing
+ * of the SIGCHLD signal, similar to
+ * the _exit() behaviour, by providing
+ * our ksiginfo. Ksi is freed by the
+ * signal delivery.
+ */
+ if (q->p_ksi == NULL) {
+ ksi1 = NULL;
+ } else {
+ ksiginfo_copy(q->p_ksi, ksi);
+ ksi->ksi_flags |= KSI_INS;
+ ksi1 = ksi;
+ ksi = NULL;
+ }
PROC_LOCK(q->p_reaper);
- pksignal(q->p_reaper, SIGCHLD, q->p_ksi);
+ pksignal(q->p_reaper, SIGCHLD, ksi1);
PROC_UNLOCK(q->p_reaper);
}
} else {
@@ -489,6 +508,8 @@ exit1(struct thread *td, int rval, int s
kern_psignal(q, SIGKILL);
}
PROC_UNLOCK(q);
+ if (ksi != NULL)
+ ksiginfo_free(ksi);
}
/*
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
