Page MenuHomeFreeBSD
Files F106095057

D18618.id52193.diff
No OneTemporary
Actions

D18618.id52193.diff
View Options

Index: sys/kern/kern_sig.c
===================================================================
--- sys/kern/kern_sig.c
+++ sys/kern/kern_sig.c
@@ -3098,8 +3098,10 @@
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 ? (p->p_ucred->cr_prison ? (p->p_ucred->cr_prison->pr_id) : -1) : -1,
+ p->p_ucred ? p->p_ucred->cr_uid : -1, why);
proc_wkilled(p);
kern_psignal(p, SIGKILL);
}
@@ -3142,8 +3144,9 @@
sig |= WCOREFLAG;
if (kern_logsigexit)
log(LOG_INFO,
- "pid %d (%s), uid %d: exited on signal %d%s\n",
+ "pid %d (%s), jid %d, uid %d: exited on signal %d%s\n",
p->p_pid, p->p_comm,
+ p->p_ucred ? (p->p_ucred->cr_prison ? (p->p_ucred->cr_prison->pr_id) : -1) : -1,
td->td_ucred ? td->td_ucred->cr_uid : -1,
sig &~ WCOREFLAG,
sig & WCOREFLAG ? " (core dumped)" : "");

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 26, 7:55 AM (8 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15602634
Default Alt Text
D18618.id52193.diff (1 KB)

Event Timeline