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

exec: textvp -> oldtextvp; binvp -> newtextvp

Browse Source 
This makes it consistent with the rest of the naming in do_execve.

No functional changes.
This commit is contained in:
mjg 2015-07-14 01:13:37 +00:00
parent 1fc8c9c24b
commit 2ee8352407
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/kern/kern_exec.c
View File

@ -359,7 +359,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;
@ -433,20 +433,20 @@ do_execve(td, args, mac_p)
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;
}
/*
@ -523,13 +523,13 @@ do_execve(td, args, mac_p)
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 */
@ -630,7 +630,7 @@ do_execve(td, args, mac_p)
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
@ -767,8 +767,8 @@ do_execve(td, args, mac_p)
* 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
/*
@ -845,8 +845,8 @@ do_execve(td, args, mac_p)
/*
* Handle deferred decrement of ref counts.
*/
if (textvp != NULL)
vrele(textvp);
if (oldtextvp != NULL)
vrele(oldtextvp);
#ifdef KTRACE
if (tracevp != NULL)
vrele(tracevp);