diff options
| author | kib <kib@FreeBSD.org> | 2009-06-21 19:21:01 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2009-06-21 19:21:01 +0000 |
| commit | 2fc79768f33d575d200ae1482dc23207f9d93703 (patch) | |
| tree | 16815288a4df4ec66279d1a1e04aabcdf84a88c9 /sys/kern/vfs_default.c | |
| parent | b69e15d521bbb1550dc659223e33c2343e332269 (diff) | |
| download | FreeBSD-src-2fc79768f33d575d200ae1482dc23207f9d93703.zip FreeBSD-src-2fc79768f33d575d200ae1482dc23207f9d93703.tar.gz | |
Add explicit struct ucred * argument for VOP_VPTOCNP, to be used by
vn_open_cred in default implementation. Valid struct ucred is needed for
audit and MAC, and curthread credentials may be wrong.
This further requires modifying the interface of vn_fullpath(9), but it
is out of scope of this change.
Reviewed by: rwatson
Diffstat (limited to 'sys/kern/vfs_default.c')
| -rw-r--r-- | sys/kern/vfs_default.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index c98dad0..86ab01e 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -693,6 +693,7 @@ vop_stdvptocnp(struct vop_vptocnp_args *ap) { struct vnode *vp = ap->a_vp; struct vnode **dvp = ap->a_vpp; + struct ucred *cred = ap->a_cred; char *buf = ap->a_buf; int *buflen = ap->a_buflen; char *dirbuf, *cpos; @@ -713,7 +714,7 @@ vop_stdvptocnp(struct vop_vptocnp_args *ap) if (vp->v_type != VDIR) return (ENOENT); - error = VOP_GETATTR(vp, &va, td->td_ucred); + error = VOP_GETATTR(vp, &va, cred); if (error) return (error); @@ -723,7 +724,7 @@ vop_stdvptocnp(struct vop_vptocnp_args *ap) NDINIT_ATVP(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, "..", vp, td); flags = FREAD; - error = vn_open_cred(&nd, &flags, 0, VN_OPEN_NOAUDIT, NULL, NULL); + error = vn_open_cred(&nd, &flags, 0, VN_OPEN_NOAUDIT, cred, NULL); if (error) { vn_lock(vp, locked | LK_RETRY); return (error); @@ -738,7 +739,7 @@ vop_stdvptocnp(struct vop_vptocnp_args *ap) *dvp = (*dvp)->v_mount->mnt_vnodecovered; VREF(mvp); VOP_UNLOCK(mvp, 0); - vn_close(mvp, FREAD, td->td_ucred, td); + vn_close(mvp, FREAD, cred, td); VREF(*dvp); vn_lock(*dvp, LK_EXCLUSIVE | LK_RETRY); covered = 1; @@ -803,7 +804,7 @@ out: vrele(mvp); } else { VOP_UNLOCK(mvp, 0); - vn_close(mvp, FREAD, td->td_ucred, td); + vn_close(mvp, FREAD, cred, td); } vn_lock(vp, locked | LK_RETRY); return (error); |
