From 180ff6921b1d995194c159729c5d494b07b802ca Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Mon, 1 Nov 2004 16:01:05 +0000 Subject: new mount option --- kernel/dir.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'kernel/dir.c') diff --git a/kernel/dir.c b/kernel/dir.c index 87dec6a..36eb3bf 100644 --- a/kernel/dir.c +++ b/kernel/dir.c @@ -505,7 +505,9 @@ static int fuse_revalidate(struct dentry *entry) if (inode->i_ino == FUSE_ROOT_INO) { if (!(fc->flags & FUSE_ALLOW_OTHER) && - current->fsuid != fc->uid) + current->fsuid != fc->uid && + (!(fc->flags & FUSE_ALLOW_ROOT) || + current->fsuid != 0)) return -EACCES; } else if (!fi->i_time || time_before_eq(jiffies, fi->i_time)) return 0; @@ -517,7 +519,8 @@ static int _fuse_permission(struct inode *inode, int mask) { struct fuse_conn *fc = INO_FC(inode); - if (!(fc->flags & FUSE_ALLOW_OTHER) && current->fsuid != fc->uid) + if (!(fc->flags & FUSE_ALLOW_OTHER) && current->fsuid != fc->uid && + (!(fc->flags & FUSE_ALLOW_ROOT) || current->fsuid != 0)) return -EACCES; else if (fc->flags & FUSE_DEFAULT_PERMISSIONS) { int err = vfs_permission(inode, mask); -- cgit v1.2.3