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

Use shared lock for the executable vnode in the exec path after the

Browse Source 
VV_TEXT changes are handled. Assert that vnode is exclusively locked at
the places that modify VV_TEXT.

Discussed with:	alc
MFC after:	3 weeks
This commit is contained in:
Konstantin Belousov 2012-01-19 23:03:31 +00:00
parent df4ce32fcb
commit 2974cc36f7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=230341
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/kern/kern_exec.c
View File

@ -471,6 +471,7 @@ do_execve(td, args, mac_p)
* actually an executable image.
*/
textset = imgp->vp->v_vflag & VV_TEXT;
ASSERT_VOP_ELOCKED(imgp->vp, "vv_text");
imgp->vp->v_vflag |= VV_TEXT;
error = exec_map_first_page(imgp);
@ -502,8 +503,10 @@ do_execve(td, args, mac_p)
if (error) {
if (error == -1) {
if (textset == 0)
if (textset == 0) {
ASSERT_VOP_ELOCKED(imgp->vp, "vv_text");
imgp->vp->v_vflag &= ~VV_TEXT;
}
error = ENOEXEC;
}
goto exec_fail_dealloc;
@ -596,7 +599,7 @@ do_execve(td, args, mac_p)
/* close files on exec */
fdcloseexec(td);
vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
vn_lock(imgp->vp, LK_SHARED | LK_RETRY);
/* Get a reference to the vnode prior to locking the proc */
VREF(binvp);
@ -701,7 +704,7 @@ do_execve(td, args, mac_p)
VOP_UNLOCK(imgp->vp, 0);
setugidsafety(td);
error = fdcheckstd(td);
vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
vn_lock(imgp->vp, LK_SHARED | LK_RETRY);
if (error != 0)
goto done1;
PROC_LOCK(p);
@ -805,7 +808,7 @@ do_execve(td, args, mac_p)
pe.pm_entryaddr = imgp->entry_addr;
PMC_CALL_HOOK_X(td, PMC_FN_PROCESS_EXEC, (void *) &pe);
vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
vn_lock(imgp->vp, LK_SHARED | LK_RETRY);
} else
PROC_UNLOCK(p);
#else /* !HWPMC_HOOKS */
@ -857,7 +860,7 @@ do_execve(td, args, mac_p)
if (tracecred != NULL)
crfree(tracecred);
#endif
vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY);
vn_lock(imgp->vp, LK_SHARED | LK_RETRY);
pargs_drop(oldargs);
pargs_drop(newargs);
if (oldsigacts != NULL)