Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 17 insertions, 10 deletions

diff --git a/fs/xattr.c b/fs/xattr.c
index 01bb8135e14a..f060663ab70c 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -46,20 +46,24 @@ xattr_permission(struct inode *inode, const char *name, int mask)
                 return 0;
 
         /*
-         * The trusted.* namespace can only be accessed by a privileged user.
+         * The trusted.* namespace can only be accessed by privileged users.
          */
-        if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN))
-                return (capable(CAP_SYS_ADMIN) ? 0 : -EPERM);
+        if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN)) {
+                if (!capable(CAP_SYS_ADMIN))
+                        return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
+                return 0;
+        }
 
-        /* In user.* namespace, only regular files and directories can have
+        /*
+         * In the user.* namespace, only regular files and directories can have
          * extended attributes. For sticky directories, only the owner and
-         * privileged user can write attributes.
+         * privileged users can write attributes.
          */
         if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
                 if (!S_ISREG(inode->i_mode) && !S_ISDIR(inode->i_mode))
-                        return -EPERM;
+                        return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
                 if (S_ISDIR(inode->i_mode) && (inode->i_mode & S_ISVTX) &&
-                    (mask & MAY_WRITE) && !is_owner_or_cap(inode))
+                    (mask & MAY_WRITE) && !inode_owner_or_capable(inode))
                         return -EPERM;
         }
 
@@ -87,7 +91,11 @@ int __vfs_setxattr_noperm(struct dentry *dentry, const char *name,
 {
         struct inode *inode = dentry->d_inode;
         int error = -EOPNOTSUPP;
+        int issec = !strncmp(name, XATTR_SECURITY_PREFIX,
+                                   XATTR_SECURITY_PREFIX_LEN);
 
+        if (issec)
+                inode->i_flags &= ~S_NOSEC;
         if (inode->i_op->setxattr) {
                 error = inode->i_op->setxattr(dentry, name, value, size, flags);
                 if (!error) {
@@ -95,8 +103,7 @@ int __vfs_setxattr_noperm(struct dentry *dentry, const char *name,
                         security_inode_post_setxattr(dentry, name, value,
                                                      size, flags);
                 }
-        } else if (!strncmp(name, XATTR_SECURITY_PREFIX,
-                                XATTR_SECURITY_PREFIX_LEN)) {
+        } else if (issec) {
                 const char *suffix = name + XATTR_SECURITY_PREFIX_LEN;
                 error = security_inode_setsecurity(inode, suffix, value,
                                                    size, flags);
@@ -666,7 +673,7 @@ generic_setxattr(struct dentry *dentry, const char *name, const void *value, siz
         handler = xattr_resolve_name(dentry->d_sb->s_xattr, &name);
         if (!handler)
                 return -EOPNOTSUPP;
-        return handler->set(dentry, name, value, size, 0, handler->flags);
+        return handler->set(dentry, name, value, size, flags, handler->flags);
 }
 
 /*