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

filedesc: fix missed comments about fdsetugidsafety

Browse Source 
While here just note that both fdsetugidsafety and fdcheckstd take sleepable
locks.
This commit is contained in:
Mateusz Guzik 2014-10-31 09:56:00 +00:00
parent 6575d18476
commit 8a5177cca3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=273897
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/kern/kern_descrip.c
View File

@ -2088,7 +2088,7 @@ fdescfree(struct thread *td)
* otherwise be off-limits to the process. We check for filesystems where
* the vnode can change out from under us after execve (like [lin]procfs).
*
* Since setugidsafety calls this only for fd 0, 1 and 2, this check is
* Since fdsetugidsafety calls this only for fd 0, 1 and 2, this check is
* sufficient. We also don't check for setugidness since we know we are.
*/
static bool

6
sys/kern/kern_exec.c
View File

@ -688,10 +688,8 @@ do_execve(td, args, mac_p)
* Close any file descriptors 0..2 that reference procfs,
* then make sure file descriptors 0..2 are in use.
*
* setugidsafety() may call closef() and then pfind()
* which may grab the process lock.
* fdcheckstd() may call falloc() which may block to
* allocate memory, so temporarily drop the process lock.
* Both fdsetugidsafety() and fdcheckstd() may call functions
* taking sleepable locks, so temporarily drop our locks.
*/
PROC_UNLOCK(p);
VOP_UNLOCK(imgp->vp, 0);