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

Pair the VOP_OPEN call from do_execve() with the reciprocal VOP_CLOSE.

Browse Source 
This was unnoticed because local filesystems usually do nothing
non-trivial in the close vop.

Reported and tested by:	Rick Macklem
MFC after:	2 weeks
This commit is contained in:
kib 2008-07-17 16:44:07 +00:00
parent 57b9f1fb86
commit eff9ee09b4
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/kern_exec.c
View File

@ -369,6 +369,7 @@ do_execve(td, args, mac_p)
imgp->entry_addr = 0;
imgp->vmspace_destroyed = 0;
imgp->interpreted = 0;
imgp->opened = 0;
imgp->interpreter_name = args->buf + PATH_MAX + ARG_MAX;
imgp->auxargs = NULL;
imgp->vp = NULL;
@ -496,6 +497,10 @@ do_execve(td, args, mac_p)
interplabel = mac_vnode_label_alloc();
mac_vnode_copy_label(binvp->v_label, interplabel);
#endif
if (imgp->opened) {
VOP_CLOSE(binvp, FREAD, td->td_ucred, td);
imgp->opened = 0;
}
vput(binvp);
vm_object_deallocate(imgp->object);
imgp->object = NULL;
@ -845,6 +850,8 @@ do_execve(td, args, mac_p)
if (imgp->vp != NULL) {
if (args->fname)
NDFREE(ndp, NDF_ONLY_PNBUF);
if (imgp->opened)
VOP_CLOSE(imgp->vp, FREAD, td->td_ucred, td);
vput(imgp->vp);
}
@ -1326,6 +1333,8 @@ exec_check_permissions(imgp)
* general case).
*/
error = VOP_OPEN(vp, FREAD, td->td_ucred, td, NULL);
if (error == 0)
imgp->opened = 1;
return (error);
}

1
sys/sys/imgact.h
View File

@ -58,6 +58,7 @@ struct image_params {
unsigned long entry_addr; /* entry address of target executable */
char vmspace_destroyed; /* flag - we've blown away original vm space */
char interpreted; /* flag - this executable is interpreted */
char opened; /* flag - we have opened executable vnode */
char *interpreter_name; /* name of the interpreter */
void *auxargs; /* ELF Auxinfo structure pointer */
struct sf_buf *firstpage; /* first page that we mapped */