summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_exec.c
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2008-07-17 16:44:07 +0000
committerkib <kib@FreeBSD.org>2008-07-17 16:44:07 +0000
commiteff9ee09b497649586914ac81f683696bd3d96a9 (patch)
treef21cbd05dd7155927f7e7cf5d3d85a34315fbce5 /sys/kern/kern_exec.c
parent57b9f1fb864a686e2691533a5e946d0e52380798 (diff)
downloadFreeBSD-src-eff9ee09b497649586914ac81f683696bd3d96a9.zip
FreeBSD-src-eff9ee09b497649586914ac81f683696bd3d96a9.tar.gz
Pair the VOP_OPEN call from do_execve() with the reciprocal VOP_CLOSE.
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
Diffstat (limited to 'sys/kern/kern_exec.c')
-rw-r--r--sys/kern/kern_exec.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index f4335a2..e31ca37 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -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 @@ interpret:
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 @@ exec_fail_dealloc:
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);
}
OpenPOWER on IntegriCloud