Author: kp
Date: Wed Jan 16 05:17:24 2019
New Revision: 343083
URL: https://svnweb.freebsd.org/changeset/base/343083
Log:
MFC r342591,342599:
Make kernel print jail ID when logging a process exit
Kernel now includes jail ID when logging a process exit. jid is 0 for unjailed
processes.
Submitted by: Marie Helene Kvello-Aune <free...@mhka.no>
Relnotes: yes
Sponsored by: Modirum MDPay
Modified:
stable/12/sys/kern/kern_sig.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/kern/kern_sig.c
==============================================================================
--- stable/12/sys/kern/kern_sig.c Wed Jan 16 05:15:57 2019
(r343082)
+++ stable/12/sys/kern/kern_sig.c Wed Jan 16 05:17:24 2019
(r343083)
@@ -3098,8 +3098,9 @@ killproc(struct proc *p, char *why)
PROC_LOCK_ASSERT(p, MA_OWNED);
CTR3(KTR_PROC, "killproc: proc %p (pid %d, %s)", p, p->p_pid,
p->p_comm);
- log(LOG_ERR, "pid %d (%s), uid %d, was killed: %s\n", p->p_pid,
- p->p_comm, p->p_ucred ? p->p_ucred->cr_uid : -1, why);
+ log(LOG_ERR, "pid %d (%s), jid %d, uid %d, was killed: %s\n",
+ p->p_pid, p->p_comm, p->p_ucred->cr_prison->pr_id,
+ p->p_ucred ? p->p_ucred->cr_uid : -1, why);
proc_wkilled(p);
kern_psignal(p, SIGKILL);
}
@@ -3142,8 +3143,9 @@ sigexit(struct thread *td, int sig)
sig |= WCOREFLAG;
if (kern_logsigexit)
log(LOG_INFO,
- "pid %d (%s), uid %d: exited on signal %d%s\n",
- p->p_pid, p->p_comm,
+ "pid %d (%s), jid %d, uid %d: exited on "
+ "signal %d%s\n", p->p_pid, p->p_comm,
+ p->p_ucred->cr_prison->pr_id,
td->td_ucred ? td->td_ucred->cr_uid : -1,
sig &~ WCOREFLAG,
sig & WCOREFLAG ? " (core dumped)" : "");
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
