Do not use RCU for current process credentials

Commit c69e8d9c0 added rcu lock to fuse/dir.c It was assuming
that 'task' is some other process but in fact this parameter always
equals to 'current'. Inline this parameter to make it more readable
and remove RCU lock as it is not needed when access current process
credentials.

Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index ed8f8c55ce10dec4724888f57faba514a732d0f6..aa0b6ade0e68121938fc7e56fe96d39dd84083c0 100644 (file)
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -985,7 +985,7 @@ int fuse_reverse_inval_entry(struct super_block *sb, u64 parent_nodeid,
 
 /*
  * Calling into a user-controlled filesystem gives the filesystem
- * daemon ptrace-like capabilities over the requester process.  This
+ * daemon ptrace-like capabilities over the current process.  This
  * means, that the filesystem daemon is able to record the exact
  * filesystem operations performed, and can also control the behavior
  * of the requester process in otherwise impossible ways.  For example
@@ -996,27 +996,23 @@ int fuse_reverse_inval_entry(struct super_block *sb, u64 parent_nodeid,
  * for which the owner of the mount has ptrace privilege.  This
  * excludes processes started by other users, suid or sgid processes.
  */
-int fuse_allow_task(struct fuse_conn *fc, struct task_struct *task)
+int fuse_allow_current_process(struct fuse_conn *fc)
 {
        const struct cred *cred;
-       int ret;
 
        if (fc->flags & FUSE_ALLOW_OTHER)
                return 1;
 
-       rcu_read_lock();
-       ret = 0;
-       cred = __task_cred(task);
+       cred = current_cred();
        if (uid_eq(cred->euid, fc->user_id) &&
            uid_eq(cred->suid, fc->user_id) &&
            uid_eq(cred->uid,  fc->user_id) &&
            gid_eq(cred->egid, fc->group_id) &&
            gid_eq(cred->sgid, fc->group_id) &&
            gid_eq(cred->gid,  fc->group_id))
-               ret = 1;
-       rcu_read_unlock();
+               return 1;
 
-       return ret;
+       return 0;
 }
 
 static int fuse_access(struct inode *inode, int mask)
@@ -1077,7 +1073,7 @@ static int fuse_permission(struct inode *inode, int mask)
        bool refreshed = false;
        int err = 0;
 
-       if (!fuse_allow_task(fc, current))
+       if (!fuse_allow_current_process(fc))
                return -EACCES;
 
        /*
@@ -1544,7 +1540,7 @@ static int fuse_do_setattr(struct dentry *entry, struct iattr *attr,
        loff_t oldsize;
        int err;
 
-       if (!fuse_allow_task(fc, current))
+       if (!fuse_allow_current_process(fc))
                return -EACCES;
 
        if (!(fc->flags & FUSE_DEFAULT_PERMISSIONS))
@@ -1653,7 +1649,7 @@ static int fuse_getattr(struct vfsmount *mnt, struct dentry *entry,
        struct inode *inode = entry->d_inode;
        struct fuse_conn *fc = get_fuse_conn(inode);
 
-       if (!fuse_allow_task(fc, current))
+       if (!fuse_allow_current_process(fc))
                return -EACCES;
 
        return fuse_update_attributes(inode, stat, NULL, NULL);
@@ -1756,7 +1752,7 @@ static ssize_t fuse_listxattr(struct dentry *entry, char *list, size_t size)
        struct fuse_getxattr_out outarg;
        ssize_t ret;
 
-       if (!fuse_allow_task(fc, current))
+       if (!fuse_allow_current_process(fc))
                return -EACCES;
 
        if (fc->no_listxattr)

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 28bc9c672196331e02b49783de494f0cec24fe08..a010585b0a74efab8273bf6771f26394704083e4 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2082,7 +2082,7 @@ long fuse_ioctl_common(struct file *file, unsigned int cmd,
        struct inode *inode = file->f_dentry->d_inode;
        struct fuse_conn *fc = get_fuse_conn(inode);
 
-       if (!fuse_allow_task(fc, current))
+       if (!fuse_allow_current_process(fc))
                return -EACCES;
 
        if (is_bad_inode(inode))

diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index 13befcd29c5b5eaac5978fbe3e98b6a4dc25bd25..af51c146a9aee4b69273aa599c3473dacfefc41e 100644 (file)
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -774,9 +774,9 @@ void fuse_ctl_remove_conn(struct fuse_conn *fc);
 int fuse_valid_type(int m);
 
 /**
- * Is task allowed to perform filesystem operation?
+ * Is current process allowed to perform filesystem operation?
  */
-int fuse_allow_task(struct fuse_conn *fc, struct task_struct *task);
+int fuse_allow_current_process(struct fuse_conn *fc);
 
 u64 fuse_lock_owner_id(struct fuse_conn *fc, fl_owner_t id);
 

diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 9d95a5a3d55caa049fd2aaec7fc9ef6b95b38f1b..79b70deb7cd6dba0ca53f542929fc9f93c0462f4 100644 (file)
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -408,7 +408,7 @@ static int fuse_statfs(struct dentry *dentry, struct kstatfs *buf)
        struct fuse_statfs_out outarg;
        int err;
 
-       if (!fuse_allow_task(fc, current)) {
+       if (!fuse_allow_current_process(fc)) {
                buf->f_type = FUSE_SUPER_MAGIC;
                return 0;
        }