Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs fixes from Al Viro:
 "A couple of regression fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix iov_iter_advance() for ITER_PIPE
  xattr: Fix setting security xattrs on sockfs

1 files changed, 14 insertions, 8 deletions

diff --git a/fs/xattr.c b/fs/xattr.c
index 3368659c471e..2d13b4e62fae 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -170,7 +170,7 @@ int __vfs_setxattr_noperm(struct dentry *dentry, const char *name,
                 const void *value, size_t size, int flags)
 {
         struct inode *inode = dentry->d_inode;
-        int error = -EOPNOTSUPP;
+        int error = -EAGAIN;
         int issec = !strncmp(name, XATTR_SECURITY_PREFIX,
                                    XATTR_SECURITY_PREFIX_LEN);
 
@@ -183,15 +183,21 @@ int __vfs_setxattr_noperm(struct dentry *dentry, const char *name,
                         security_inode_post_setxattr(dentry, name, value,
                                                      size, flags);
                 }
-        } else if (issec) {
-                const char *suffix = name + XATTR_SECURITY_PREFIX_LEN;
-
+        } else {
                 if (unlikely(is_bad_inode(inode)))
                         return -EIO;
-                error = security_inode_setsecurity(inode, suffix, value,
-                                                   size, flags);
-                if (!error)
-                        fsnotify_xattr(dentry);
+        }
+        if (error == -EAGAIN) {
+                error = -EOPNOTSUPP;
+
+                if (issec) {
+                        const char *suffix = name + XATTR_SECURITY_PREFIX_LEN;
+
+                        error = security_inode_setsecurity(inode, suffix, value,
+                                                           size, flags);
+                        if (!error)
+                                fsnotify_xattr(dentry);
+                }
         }
 
         return error;