summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralc <alc@FreeBSD.org>2002-02-12 04:21:28 +0000
committeralc <alc@FreeBSD.org>2002-02-12 04:21:28 +0000
commit95059f78ce4db968f092dbff1a0688fed9b63453 (patch)
tree64ac2a794a42e8f2d62823fef7bcce4c6431e1e4
parent04bdc3812f3bc1bf7c855c7c539b9b5e30f79c39 (diff)
downloadFreeBSD-src-95059f78ce4db968f092dbff1a0688fed9b63453.zip
FreeBSD-src-95059f78ce4db968f092dbff1a0688fed9b63453.tar.gz
The previous commit included a change to fill_kinfo_proc() that results
in a NULL pointer dereference. Repair this mistake.
-rw-r--r--sys/kern/kern_proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index e9b1b4c..afa53a5 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -492,7 +492,6 @@ fill_kinfo_proc(p, kp)
bzero(kp, sizeof(*kp));
- td = FIRST_THREAD_IN_PROC(p);
kp->ki_structsize = sizeof(*kp);
kp->ki_paddr = p;
PROC_LOCK(p);
@@ -540,6 +539,7 @@ fill_kinfo_proc(p, kp)
kp->ki_childtime.tv_usec = p->p_stats->p_cru.ru_utime.tv_usec +
p->p_stats->p_cru.ru_stime.tv_usec;
}
+ td = FIRST_THREAD_IN_PROC(p);
if (td->td_wmesg != NULL)
strncpy(kp->ki_wmesg, td->td_wmesg, sizeof(kp->ki_wmesg) - 1);
if (p->p_stat == SMTX) {
OpenPOWER on IntegriCloud