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

Temporarily unlock vnode for new image being executed to avoid lock order

Browse Source 
reversals that can lead to deadlocks.  Normally vn_close(), namei() or vrele()
should not be called while holding vnode locks.
This commit is contained in:
tegge 2006-05-05 20:25:05 +00:00
parent b9db75cffc
commit ce79e019da
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/kern_exec.c
View File

@ -487,7 +487,9 @@ interpret:
}
/* close files on exec */
VOP_UNLOCK(imgp->vp, 0, td);
fdcloseexec(td);
vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
/* Get a reference to the vnode prior to locking the proc */
VREF(ndp->ni_vp);
@ -582,7 +584,9 @@ interpret:
*/
PROC_UNLOCK(p);
setugidsafety(td);
VOP_UNLOCK(imgp->vp, 0, td);
error = fdcheckstd(td);
vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
if (error != 0)
goto done1;
PROC_LOCK(p);
@ -714,6 +718,7 @@ done1:
crfree(oldcred);
else
crfree(newcred);
VOP_UNLOCK(imgp->vp, 0, td);
/*
* Handle deferred decrement of ref counts.
*/
@ -732,6 +737,7 @@ done1:
if (tracecred != NULL)
crfree(tracecred);
#endif
vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td);
if (oldargs != NULL)
pargs_drop(oldargs);
if (newargs != NULL)