diff options
author | jhb <jhb@FreeBSD.org> | 2011-04-06 17:47:22 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2011-04-06 17:47:22 +0000 |
commit | 96b1d8b6d77acdb5fb5d615776525213574ca4a1 (patch) | |
tree | e1a7d23b047f49d9788c92447c38bbdf67e1b7bc /sys/kern | |
parent | 1f9ba05458bd93ceac8e442ead548c21930d610b (diff) | |
download | FreeBSD-src-96b1d8b6d77acdb5fb5d615776525213574ca4a1.zip FreeBSD-src-96b1d8b6d77acdb5fb5d615776525213574ca4a1.tar.gz |
Fix several places to ignore processes that are not yet fully constructed.
MFC after: 1 week
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/kern_clock.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_ktrace.c | 3 | ||||
-rw-r--r-- | sys/kern/kern_resource.c | 9 | ||||
-rw-r--r-- | sys/kern/kern_sig.c | 6 | ||||
-rw-r--r-- | sys/kern/sched_4bsd.c | 4 |
5 files changed, 20 insertions, 6 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 1754f7b..f3f49ca 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -201,6 +201,10 @@ deadlkres(void) tryl = 0; FOREACH_PROC_IN_SYSTEM(p) { PROC_LOCK(p); + if (p->p_state == PRS_NEW) { + PROC_UNLOCK(p); + continue; + } FOREACH_THREAD_IN_PROC(p, td) { /* diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 6c31cbf..5db5aee 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -882,7 +882,8 @@ ktrace(td, uap) nfound = 0; LIST_FOREACH(p, &pg->pg_members, p_pglist) { PROC_LOCK(p); - if (p_cansee(td, p) != 0) { + if (p->p_state == PRS_NEW || + p_cansee(td, p) != 0) { PROC_UNLOCK(p); continue; } diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index fa7437d..1062703 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -129,7 +129,8 @@ getpriority(td, uap) sx_sunlock(&proctree_lock); LIST_FOREACH(p, &pg->pg_members, p_pglist) { PROC_LOCK(p); - if (p_cansee(td, p) == 0) { + if (p->p_state == PRS_NORMAL && + p_cansee(td, p) == 0) { if (p->p_nice < low) low = p->p_nice; } @@ -215,7 +216,8 @@ setpriority(td, uap) sx_sunlock(&proctree_lock); LIST_FOREACH(p, &pg->pg_members, p_pglist) { PROC_LOCK(p); - if (p_cansee(td, p) == 0) { + if (p->p_state == PRS_NORMAL && + p_cansee(td, p) == 0) { error = donice(td, p, uap->prio); found++; } @@ -230,7 +232,8 @@ setpriority(td, uap) sx_slock(&allproc_lock); FOREACH_PROC_IN_SYSTEM(p) { PROC_LOCK(p); - if (p->p_ucred->cr_uid == uap->who && + if (p->p_state == PRS_NORMAL && + p->p_ucred->cr_uid == uap->who && p_cansee(td, p) == 0) { error = donice(td, p, uap->prio); found++; diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 0bea842..9c30dc2 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1799,7 +1799,8 @@ pgsignal(struct pgrp *pgrp, int sig, int checkctty, ksiginfo_t *ksi) PGRP_LOCK_ASSERT(pgrp, MA_OWNED); LIST_FOREACH(p, &pgrp->pg_members, p_pglist) { PROC_LOCK(p); - if (checkctty == 0 || p->p_flag & P_CONTROLT) + if (p->p_state == PRS_NORMAL && + (checkctty == 0 || p->p_flag & P_CONTROLT)) pksignal(p, sig, ksi); PROC_UNLOCK(p); } @@ -3313,7 +3314,8 @@ pgsigio(sigiop, sig, checkctty) PGRP_LOCK(sigio->sio_pgrp); LIST_FOREACH(p, &sigio->sio_pgrp->pg_members, p_pglist) { PROC_LOCK(p); - if (CANSIGIO(sigio->sio_ucred, p->p_ucred) && + if (p->p_state == PRS_NORMAL && + CANSIGIO(sigio->sio_ucred, p->p_ucred) && (checkctty == 0 || (p->p_flag & P_CONTROLT))) psignal(p, sig); PROC_UNLOCK(p); diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index c96d7b5..3129222 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -463,6 +463,10 @@ schedcpu(void) sx_slock(&allproc_lock); FOREACH_PROC_IN_SYSTEM(p) { PROC_LOCK(p); + if (p->p_state == PRS_NEW) { + PROC_UNLOCK(p); + continue; + } FOREACH_THREAD_IN_PROC(p, td) { awake = 0; thread_lock(td); |