Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull misc vfs updates from Al Viro:
 "All kinds of stuff.  That probably should've been 5 or 6 separate
  branches, but by the time I'd realized how large and mixed that bag
  had become it had been too close to -final to play with rebasing.

  Some fs/namei.c cleanups there, memdup_user_nul() introduction and
  switching open-coded instances, burying long-dead code, whack-a-mole
  of various kinds, several new helpers for ->llseek(), assorted
  cleanups and fixes from various people, etc.

  One piece probably deserves special mention - Neil's
  lookup_one_len_unlocked().  Similar to lookup_one_len(), but gets
  called without ->i_mutex and tries to avoid ever taking it.  That, of
  course, means that it's not useful for any directory modifications,
  but things like getting inode attributes in nfds readdirplus are fine
  with that.  I really should've asked for moratorium on lookup-related
  changes this cycle, but since I hadn't done that early enough...  I
  *am* asking for that for the coming cycle, though - I'm going to try
  and get conversion of i_mutex to rwsem with ->lookup() done under lock
  taken shared.

  There will be a patch closer to the end of the window, along the lines
  of the one Linus had posted last May - mechanical conversion of
  ->i_mutex accesses to inode_lock()/inode_unlock()/inode_trylock()/
  inode_is_locked()/inode_lock_nested().  To quote Linus back then:

    -----
    |    This is an automated patch using
    |
    |        sed 's/mutex_lock(&\(.*\)->i_mutex)/inode_lock(\1)/'
    |        sed 's/mutex_unlock(&\(.*\)->i_mutex)/inode_unlock(\1)/'
    |        sed 's/mutex_lock_nested(&\(.*\)->i_mutex,[     ]*I_MUTEX_\([A-Z0-9_]*\))/inode_lock_nested(\1, I_MUTEX_\2)/'
    |        sed 's/mutex_is_locked(&\(.*\)->i_mutex)/inode_is_locked(\1)/'
    |        sed 's/mutex_trylock(&\(.*\)->i_mutex)/inode_trylock(\1)/'
    |
    |    with a very few manual fixups
    -----

  I'm going to send that once the ->i_mutex-affecting stuff in -next
  gets mostly merged (or when Linus says he's about to stop taking
  merges)"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits)
  nfsd: don't hold i_mutex over userspace upcalls
  fs:affs:Replace time_t with time64_t
  fs/9p: use fscache mutex rather than spinlock
  proc: add a reschedule point in proc_readfd_common()
  logfs: constify logfs_block_ops structures
  fcntl: allow to set O_DIRECT flag on pipe
  fs: __generic_file_splice_read retry lookup on AOP_TRUNCATED_PAGE
  fs: xattr: Use kvfree()
  [s390] page_to_phys() always returns a multiple of PAGE_SIZE
  nbd: use ->compat_ioctl()
  fs: use block_device name vsprintf helper
  lib/vsprintf: add %*pg format specifier
  fs: use gendisk->disk_name where possible
  poll: plug an unused argument to do_poll
  amdkfd: don't open-code memdup_user()
  cdrom: don't open-code memdup_user()
  rsxx: don't open-code memdup_user()
  mtip32xx: don't open-code memdup_user()
  [um] mconsole: don't open-code memdup_user_nul()
  [um] hostaudio: don't open-code memdup_user()
  ...

1 files changed, 14 insertions, 24 deletions

diff --git a/fs/xattr.c b/fs/xattr.c
index d7f5037a17b5..d5dd6c8b82a7 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -305,7 +305,6 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
 {
         int error;
         void *kvalue = NULL;
-        void *vvalue = NULL;    /* If non-NULL, we used vmalloc() */
         char kname[XATTR_NAME_MAX + 1];
 
         if (flags & ~(XATTR_CREATE|XATTR_REPLACE))
@@ -322,10 +321,9 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
                         return -E2BIG;
                 kvalue = kmalloc(size, GFP_KERNEL | __GFP_NOWARN);
                 if (!kvalue) {
-                        vvalue = vmalloc(size);
-                        if (!vvalue)
+                        kvalue = vmalloc(size);
+                        if (!kvalue)
                                 return -ENOMEM;
-                        kvalue = vvalue;
                 }
                 if (copy_from_user(kvalue, value, size)) {
                         error = -EFAULT;
@@ -338,10 +336,8 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
 
         error = vfs_setxattr(d, kname, kvalue, size, flags);
 out:
-        if (vvalue)
-                vfree(vvalue);
-        else
-                kfree(kvalue);
+        kvfree(kvalue);
+
         return error;
 }
 
@@ -409,7 +405,6 @@ getxattr(struct dentry *d, const char __user *name, void __user *value,
 {
         ssize_t error;
         void *kvalue = NULL;
-        void *vvalue = NULL;
         char kname[XATTR_NAME_MAX + 1];
 
         error = strncpy_from_user(kname, name, sizeof(kname));
@@ -423,10 +418,9 @@ getxattr(struct dentry *d, const char __user *name, void __user *value,
                         size = XATTR_SIZE_MAX;
                 kvalue = kzalloc(size, GFP_KERNEL | __GFP_NOWARN);
                 if (!kvalue) {
-                        vvalue = vmalloc(size);
-                        if (!vvalue)
+                        kvalue = vmalloc(size);
+                        if (!kvalue)
                                 return -ENOMEM;
-                        kvalue = vvalue;
                 }
         }
 
@@ -442,10 +436,9 @@ getxattr(struct dentry *d, const char __user *name, void __user *value,
                    than XATTR_SIZE_MAX bytes. Not possible. */
                 error = -E2BIG;
         }
-        if (vvalue)
-                vfree(vvalue);
-        else
-                kfree(kvalue);
+
+        kvfree(kvalue);
+
         return error;
 }
 
@@ -502,17 +495,15 @@ listxattr(struct dentry *d, char __user *list, size_t size)
 {
         ssize_t error;
         char *klist = NULL;
-        char *vlist = NULL;     /* If non-NULL, we used vmalloc() */
 
         if (size) {
                 if (size > XATTR_LIST_MAX)
                         size = XATTR_LIST_MAX;
                 klist = kmalloc(size, __GFP_NOWARN | GFP_KERNEL);
                 if (!klist) {
-                        vlist = vmalloc(size);
-                        if (!vlist)
+                        klist = vmalloc(size);
+                        if (!klist)
                                 return -ENOMEM;
-                        klist = vlist;
                 }
         }
 
@@ -525,10 +516,9 @@ listxattr(struct dentry *d, char __user *list, size_t size)
                    than XATTR_LIST_MAX bytes. Not possible. */
                 error = -E2BIG;
         }
-        if (vlist)
-                vfree(vlist);
-        else
-                kfree(klist);
+
+        kvfree(klist);
+
         return error;
 }