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

Pull more misc uaccess and vfs updates from Al Viro:
 "The rest of the stuff from -next (more uaccess work) + assorted fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  score: traps: Add missing include file to fix build error
  fs/super.c: don't fool lockdep in freeze_super() and thaw_super() paths
  fs/super.c: fix race between freeze_super() and thaw_super()
  overlayfs: Fix setting IOP_XATTR flag
  iov_iter: kernel-doc import_iovec() and rw_copy_check_uvector()
  blackfin: no access_ok() for __copy_{to,from}_user()
  arm64: don't zero in __copy_from_user{,_inatomic}
  arm: don't zero in __copy_from_user_inatomic()/__copy_from_user()
  arc: don't leak bits of kernel stack into coredump
  alpha: get rid of tail-zeroing in __copy_user()

2 files changed, 2 insertions, 37 deletions

diff --git a/arch/alpha/lib/copy_user.S b/arch/alpha/lib/copy_user.S
index 2238068b1b40..509f62b65311 100644
--- a/arch/alpha/lib/copy_user.S
+++ b/arch/alpha/lib/copy_user.S
@@ -126,22 +126,8 @@ $65:
         bis $31,$31,$0
 $41:
 $35:
-$exitout:
-        ret $31,($28),1
-
 $exitin:
-        /* A stupid byte-by-byte zeroing of the rest of the output
-           buffer.  This cures security holes by never leaving 
-           random kernel data around to be copied elsewhere.  */
-
-        mov $0,$1
-$101:
-        EXO ( ldq_u $2,0($6) )
-        subq $1,1,$1
-        mskbl $2,$6,$2
-        EXO ( stq_u $2,0($6) )
-        addq $6,1,$6
-        bgt $1,$101
+$exitout:
         ret $31,($28),1
 
         .end __copy_user
diff --git a/arch/alpha/lib/ev6-copy_user.S b/arch/alpha/lib/ev6-copy_user.S
index debcc3b6b704..be720b518af9 100644
--- a/arch/alpha/lib/ev6-copy_user.S
+++ b/arch/alpha/lib/ev6-copy_user.S
@@ -228,33 +228,12 @@ $dirtyentry:
         bgt $0,$onebyteloop     # U  .. .. ..   : U L U L
 
 $zerolength:
+$exitin:
 $exitout:                       # Destination for exception recovery(?)
         nop                     # .. .. .. E
         nop                     # .. .. E  ..
         nop                     # .. E  .. ..
         ret $31,($28),1         # L0 .. .. ..   : L U L U
 
-$exitin:
-
-        /* A stupid byte-by-byte zeroing of the rest of the output
-           buffer.  This cures security holes by never leaving 
-           random kernel data around to be copied elsewhere.  */
-
-        nop
-        nop
-        nop
-        mov     $0,$1
-
-$101:
-        EXO ( stb $31,0($6) )   # L
-        subq $1,1,$1            # E
-        addq $6,1,$6            # E
-        bgt $1,$101             # U
-
-        nop
-        nop
-        nop
-        ret $31,($28),1         # L0
-
         .end __copy_user
         EXPORT_SYMBOL(__copy_user)