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

In procfs_readdir(), when the directory being read was a process directory,

Browse Source 
the target process was being held locked during the uiomove() call.  If the
process calling readdir() was the same as the target process (for instance
'ls /proc/curproc/'), and uiomove() caused a page fault, the result would
be a proc lock recursion.  I have no idea how long this has been broken -
possibly ever since pfind() was changed to lock the process it returns.

Also replace the one and only call to procfs_findtextvp() with a direct
test of td->td_proc->p_textvp.
This commit is contained in:
des 2001-10-07 19:37:13 +00:00
parent aadf7f2191
commit 532068abe2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/fs/procfs/procfs_vnops.c
View File

@ -741,7 +741,7 @@ procfs_validfile(td)
struct thread *td;
{
return (procfs_findtextvp(td->td_proc) != NULLVP);
return (td->td_proc->p_textvp != NULLVP);
}
/*
@ -816,8 +816,10 @@ procfs_readdir(ap)
bcopy(pt->pt_name, dp->d_name, pt->pt_namlen + 1);
dp->d_type = pt->pt_type;
PROC_UNLOCK(p);
if ((error = uiomove((caddr_t)dp, delen, uio)) != 0)
break;
PROC_LOCK(p);
}
PROC_UNLOCK(p);