From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 15 Oct 2016 01:19:05 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b26b5ef5ec7eab0e1d84c5b281e87b2f2a5e0586;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' of git://git./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()
---

b26b5ef5ec7eab0e1d84c5b281e87b2f2a5e0586
diff --cc arch/alpha/lib/ev6-copy_user.S
index debcc3b6b704,c4d0689c3d26..be720b518af9
--- a/arch/alpha/lib/ev6-copy_user.S
+++ b/arch/alpha/lib/ev6-copy_user.S
@@@ -234,27 -234,5 +235,5 @@@ $exitout:			# Destination for exceptio
  	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)