summaryrefslogtreecommitdiff
path: root/sys/kern/vfs_lookup.c
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2002-10-19 21:25:51 +0000
committerRobert Watson <rwatson@FreeBSD.org>2002-10-19 21:25:51 +0000
commitb614dd131a50263a47300a086844dbff6c58434d (patch)
treec926c3101bf4e0c306e0e6c3a05276fb299c005b /sys/kern/vfs_lookup.c
parent3ab93f09584586dd15ddb5971d7409a29007e50a (diff)
Notes
Diffstat (limited to 'sys/kern/vfs_lookup.c')
-rw-r--r--sys/kern/vfs_lookup.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index db1b34237922..f064b6460ad9 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -216,9 +216,12 @@ namei(ndp)
break;
}
#ifdef MAC
- error = mac_check_vnode_readlink(td->td_ucred, ndp->ni_vp);
- if (error)
- break;
+ if ((cnp->cn_flags & NOMACCHECK) == 0) {
+ error = mac_check_vnode_readlink(td->td_ucred,
+ ndp->ni_vp);
+ if (error)
+ break;
+ }
#endif
if (ndp->ni_pathlen > 1)
cp = uma_zalloc(namei_zone, M_WAITOK);
@@ -471,9 +474,11 @@ dirloop:
*/
unionlookup:
#ifdef MAC
- error = mac_check_vnode_lookup(td->td_ucred, dp, cnp);
- if (error)
- goto bad;
+ if ((cnp->cn_flags & NOMACCHECK) == 0) {
+ error = mac_check_vnode_lookup(td->td_ucred, dp, cnp);
+ if (error)
+ goto bad;
+ }
#endif
ndp->ni_dvp = dp;
ndp->ni_vp = NULL;