The previous commit included a change to fill_kinfo_proc() that results
in a NULL pointer dereference. Repair this mistake.
This commit is contained in:
parent
5a5c17db08
commit
8ab8df83d5
@ -492,7 +492,6 @@ fill_kinfo_proc(p, kp)
|
|||||||
|
|
||||||
bzero(kp, sizeof(*kp));
|
bzero(kp, sizeof(*kp));
|
||||||
|
|
||||||
td = FIRST_THREAD_IN_PROC(p);
|
|
||||||
kp->ki_structsize = sizeof(*kp);
|
kp->ki_structsize = sizeof(*kp);
|
||||||
kp->ki_paddr = p;
|
kp->ki_paddr = p;
|
||||||
PROC_LOCK(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 +
|
kp->ki_childtime.tv_usec = p->p_stats->p_cru.ru_utime.tv_usec +
|
||||||
p->p_stats->p_cru.ru_stime.tv_usec;
|
p->p_stats->p_cru.ru_stime.tv_usec;
|
||||||
}
|
}
|
||||||
|
td = FIRST_THREAD_IN_PROC(p);
|
||||||
if (td->td_wmesg != NULL)
|
if (td->td_wmesg != NULL)
|
||||||
strncpy(kp->ki_wmesg, td->td_wmesg, sizeof(kp->ki_wmesg) - 1);
|
strncpy(kp->ki_wmesg, td->td_wmesg, sizeof(kp->ki_wmesg) - 1);
|
||||||
if (p->p_stat == SMTX) {
|
if (p->p_stat == SMTX) {
|
||||||
|
Loading…
Reference in New Issue
Block a user