d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Close some holes with p->p_args by NULL'ing out the p->p_args pointer

Browse Source 
while holding the proc lock, and by holding the pargs structure when
accessing it from outside of the owner.

Submitted by: Jonathan Mini <mini@haikugeek.com>
This commit is contained in:
Alfred Perlstein 2002-03-31 10:33:12 +00:00
parent 8fdb202d85
commit 7b11fea64f
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/kern/kern_exit.c
View File

@ -503,6 +503,7 @@ wait1(td, uap, compat)
{
register int nfound;
register struct proc *q, *p, *t;
struct pargs *pa;
int status, error;
mtx_lock(&Giant);
@ -604,6 +605,8 @@ loop:
sx_xunlock(&proctree_lock);
PROC_LOCK(p);
p->p_xstat = 0;
pa = p->p_args;
p->p_args = NULL;
PROC_UNLOCK(p);
ruadd(&q->p_stats->p_cru, p->p_ru);
FREE(p->p_ru, M_ZOMBIE);
@ -637,7 +640,7 @@ loop:
/*
* Remove unused arguments
*/
pargs_drop(p->p_args);
pargs_drop(pa);
if (--p->p_procsig->ps_refcnt == 0) {
if (p->p_sigacts != &p->p_uarea->u_sigacts)

13
sys/kern/kern_proc.c
View File

@ -1019,10 +1019,17 @@ sysctl_kern_proc_args(SYSCTL_HANDLER_ARGS)
if (req->newptr && curproc != p)
return (EPERM);
if (req->oldptr && p->p_args != NULL)
error = SYSCTL_OUT(req, p->p_args->ar_args, p->p_args->ar_length);
if (req->newptr == NULL)
PROC_LOCK(p);
pa = p->p_args;
pargs_hold(pa);
PROC_UNLOCK(p);
if (req->oldptr && pa != NULL) {
error = SYSCTL_OUT(req, pa->ar_args, pa->ar_length);
}
if (req->newptr == NULL) {
pargs_drop(pa);
return (error);
}
PROC_LOCK(p);
pa = p->p_args;