summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2013-06-24 19:43:25 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2013-06-24 19:43:25 +0000
commit712a052fc049e66132960e6620b1aa18a1204410 (patch)
tree69fa57da0b095efd6c4da4c9138800a25a387bff /usr/src
parentec8de00f9ce33583c14ece43e2f797b6bc3bbbf1 (diff)
downloadillumos-joyent-712a052fc049e66132960e6620b1aa18a1204410.tar.gz
OS-2333 would like a way to disable NFS client in zones
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/common/fs/nfs/nfs3_vfsops.c3
-rw-r--r--usr/src/uts/common/fs/nfs/nfs4_vfsops.c2
-rw-r--r--usr/src/uts/common/fs/nfs/nfs_vfsops.c3
3 files changed, 8 insertions, 0 deletions
diff --git a/usr/src/uts/common/fs/nfs/nfs3_vfsops.c b/usr/src/uts/common/fs/nfs/nfs3_vfsops.c
index 207a708771..bdb3d097d2 100644
--- a/usr/src/uts/common/fs/nfs/nfs3_vfsops.c
+++ b/usr/src/uts/common/fs/nfs/nfs3_vfsops.c
@@ -500,6 +500,9 @@ nfs3_mount(vfs_t *vfsp, vnode_t *mvp, struct mounta *uap, cred_t *cr)
if ((error = secpolicy_fs_mount(cr, mvp, vfsp)) != 0)
return (EPERM);
+ if (secpolicy_nfs(cr) != 0)
+ return (EPERM);
+
if (mvp->v_type != VDIR)
return (ENOTDIR);
diff --git a/usr/src/uts/common/fs/nfs/nfs4_vfsops.c b/usr/src/uts/common/fs/nfs/nfs4_vfsops.c
index 1752a28542..002a5e4bdc 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_vfsops.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_vfsops.c
@@ -713,6 +713,8 @@ nfs4_mount(vfs_t *vfsp, vnode_t *mvp, struct mounta *uap, cred_t *cr)
if (secpolicy_fs_mount(cr, mvp, vfsp) != 0)
return (EPERM);
+ if (secpolicy_nfs(cr) != 0)
+ return (EPERM);
if (mvp->v_type != VDIR)
return (ENOTDIR);
diff --git a/usr/src/uts/common/fs/nfs/nfs_vfsops.c b/usr/src/uts/common/fs/nfs/nfs_vfsops.c
index 57b21778b4..205bd3d70c 100644
--- a/usr/src/uts/common/fs/nfs/nfs_vfsops.c
+++ b/usr/src/uts/common/fs/nfs/nfs_vfsops.c
@@ -518,6 +518,9 @@ nfs_mount(vfs_t *vfsp, vnode_t *mvp, struct mounta *uap, cred_t *cr)
if ((error = secpolicy_fs_mount(cr, mvp, vfsp)) != 0)
return (error);
+ if (secpolicy_nfs(cr) != 0)
+ return (EPERM);
+
if (mvp->v_type != VDIR)
return (ENOTDIR);