diff options
| author | kevlo <kevlo@FreeBSD.org> | 2012-02-24 07:29:06 +0000 |
|---|---|---|
| committer | kevlo <kevlo@FreeBSD.org> | 2012-02-24 07:29:06 +0000 |
| commit | 40d4ee2a22635414e62de96003362b6f5f66a249 (patch) | |
| tree | 64ef5c5ec366a65023b4ad6ea6ef16c680812484 /sys/fs | |
| parent | 69050fa3183539fba0cb5ca1593b7e80e8359fd5 (diff) | |
| download | FreeBSD-src-40d4ee2a22635414e62de96003362b6f5f66a249.zip FreeBSD-src-40d4ee2a22635414e62de96003362b6f5f66a249.tar.gz | |
Check if the user has necessary permissions on the device
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/ntfs/ntfs_vfsops.c | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c index 8ec5fe6..912be5c 100644 --- a/sys/fs/ntfs/ntfs_vfsops.c +++ b/sys/fs/ntfs/ntfs_vfsops.c @@ -33,6 +33,7 @@ #include <sys/systm.h> #include <sys/namei.h> #include <sys/conf.h> +#include <sys/priv.h> #include <sys/proc.h> #include <sys/kernel.h> #include <sys/vnode.h> @@ -150,13 +151,16 @@ static const char *ntfs_opts[] = { }; static int -ntfs_mount (struct mount *mp) +ntfs_mount(struct mount *mp) { - int err = 0, error; - struct vnode *devvp; + int err = 0, error; + accmode_t accmode; + struct vnode *devvp; struct nameidata ndp; + struct thread *td; char *from; + td = curthread; if (vfs_filteropt(mp->mnt_optnew, ntfs_opts)) return (EINVAL); @@ -183,7 +187,7 @@ ntfs_mount (struct mount *mp) * Not an update, or updating the name: look up the name * and verify that it refers to a sensible block device. */ - NDINIT(&ndp, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, from, curthread); + NDINIT(&ndp, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, from, td); err = namei(&ndp); if (err) { /* can't get devvp!*/ @@ -197,6 +201,21 @@ ntfs_mount (struct mount *mp) return (err); } + /* + * If mount by non-root, then verify that user has necessary + * permissions on the device. + */ + accmode = VREAD; + if ((mp->mnt_flag & MNT_RDONLY) == 0) + accmode |= VWRITE; + err = VOP_ACCESS(devvp, accmode, td->td_ucred, td); + if (err) + err = priv_check(td, PRIV_VFS_MOUNT_PERM); + if (err) { + vput(devvp); + return (err); + } + if (mp->mnt_flag & MNT_UPDATE) { #if 0 /* @@ -230,7 +249,7 @@ ntfs_mount (struct mount *mp) /* Save "mounted from" info for mount point (NULL pad)*/ vfs_mountedfrom(mp, from); - err = ntfs_mountfs(devvp, mp, curthread); + err = ntfs_mountfs(devvp, mp, td); } if (err) { vrele(devvp); @@ -243,7 +262,7 @@ error_1: /* no state to back out*/ /* XXX: missing NDFREE(&ndp, ...) */ success: - return(err); + return (err); } /* |
