Author: bdrewery
Date: Mon Jun 27 21:37:30 2016
New Revision: 302232
URL: https://svnweb.freebsd.org/changeset/base/302232
Log:
MFC r285513:
exec: textvp -> oldtextvp; binvp -> newtextvp
Modified:
stable/10/sys/kern/kern_exec.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/kern/kern_exec.c
==============================================================================
--- stable/10/sys/kern/kern_exec.c Mon Jun 27 21:35:19 2016
(r302231)
+++ stable/10/sys/kern/kern_exec.c Mon Jun 27 21:37:30 2016
(r302232)
@@ -372,7 +372,7 @@ do_execve(td, args, mac_p)
struct vnode *tracevp = NULL;
struct ucred *tracecred = NULL;
#endif
- struct vnode *textvp = NULL, *binvp;
+ struct vnode *oldtextvp = NULL, *newtextvp;
cap_rights_t rights;
int credential_changing;
int textset;
@@ -446,20 +446,20 @@ interpret:
if (error)
goto exec_fail;
- binvp = nd.ni_vp;
- imgp->vp = binvp;
+ newtextvp = nd.ni_vp;
+ imgp->vp = newtextvp;
} else {
AUDIT_ARG_FD(args->fd);
/*
* Descriptors opened only with O_EXEC or O_RDONLY are allowed.
*/
error = fgetvp_exec(td, args->fd,
- cap_rights_init(&rights, CAP_FEXECVE), &binvp);
+ cap_rights_init(&rights, CAP_FEXECVE), &newtextvp);
if (error)
goto exec_fail;
- vn_lock(binvp, LK_EXCLUSIVE | LK_RETRY);
- AUDIT_ARG_VNODE1(binvp);
- imgp->vp = binvp;
+ vn_lock(newtextvp, LK_EXCLUSIVE | LK_RETRY);
+ AUDIT_ARG_VNODE1(newtextvp);
+ imgp->vp = newtextvp;
}
/*
@@ -536,13 +536,13 @@ interpret:
if (args->fname != NULL)
NDFREE(&nd, NDF_ONLY_PNBUF);
#ifdef MAC
- mac_execve_interpreter_enter(binvp, &interpvplabel);
+ mac_execve_interpreter_enter(newtextvp, &interpvplabel);
#endif
if (imgp->opened) {
- VOP_CLOSE(binvp, FREAD, td->td_ucred, td);
+ VOP_CLOSE(newtextvp, FREAD, td->td_ucred, td);
imgp->opened = 0;
}
- vput(binvp);
+ vput(newtextvp);
vm_object_deallocate(imgp->object);
imgp->object = NULL;
/* set new name to that of the interpreter */
@@ -643,7 +643,7 @@ interpret:
if (args->fname)
bcopy(nd.ni_cnd.cn_nameptr, p->p_comm,
min(nd.ni_cnd.cn_namelen, MAXCOMLEN));
- else if (vn_commname(binvp, p->p_comm, sizeof(p->p_comm)) != 0)
+ else if (vn_commname(newtextvp, p->p_comm, sizeof(p->p_comm)) != 0)
bcopy(fexecv_proc_title, p->p_comm, sizeof(fexecv_proc_title));
bcopy(p->p_comm, td->td_name, sizeof(td->td_name));
#ifdef KTR
@@ -782,8 +782,8 @@ interpret:
* Store the vp for use in procfs. This vnode was referenced by namei
* or fgetvp_exec.
*/
- textvp = p->p_textvp;
- p->p_textvp = binvp;
+ oldtextvp = p->p_textvp;
+ p->p_textvp = newtextvp;
#ifdef KDTRACE_HOOKS
/*
@@ -860,8 +860,8 @@ done1:
/*
* Handle deferred decrement of ref counts.
*/
- if (textvp != NULL)
- vrele(textvp);
+ if (oldtextvp != NULL)
+ vrele(oldtextvp);
#ifdef KTRACE
if (tracevp != NULL)
vrele(tracevp);
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
