diff options
| -rw-r--r-- | sys/kern/vfs_mount.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index b4e113b2d7753..e57fa6392eae4 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -686,22 +686,21 @@ vfs_domount( if (error) return (error); } + /* - * Do not allow NFS export by non-root users. + * Do not allow NFS export or MNT_SUIDDIR by unprivileged users. */ - if (fsflags & MNT_EXPORTED) { + if (fsflags & (MNT_EXPORTED | MNT_SUIDDIR)) { error = suser(td); if (error) return (error); } /* - * Silently enforce MNT_NOSUID, MNT_NODEV and MNT_USER - * for unprivileged users and remove MNT_SUIDDIR. + * Silently enforce MNT_NODEV, MNT_NOSUID and MNT_USER for + * unprivileged users. */ - if (suser(td)) { - fsflags &= ~MNT_SUIDDIR; - fsflags |= MNT_NOSUID | MNT_NODEV | MNT_USER; - } + if (suser(td) != 0) + fsflags |= MNT_NODEV | MNT_NOSUID | MNT_USER; /* * Get vnode to be covered */ |