From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 May 2017 21:41:04 +0000 (-0700)
Subject: Merge branch 'work.uaccess' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: MMI-PSA29.97-13-9~5746
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5db6db0d400edd8bec274e34960cfa22838e1df5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'work.uaccess' of git://git./linux/kernel/git/viro/vfs

Pull uaccess unification updates from Al Viro:
 "This is the uaccess unification pile. It's _not_ the end of uaccess
  work, but the next batch of that will go into the next cycle. This one
  mostly takes copy_from_user() and friends out of arch/* and gets the
  zero-padding behaviour in sync for all architectures.

  Dealing with the nocache/writethrough mess is for the next cycle;
  fortunately, that's x86-only. Same for cleanups in iov_iter.c (I am
  sold on access_ok() in there, BTW; just not in this pile), same for
  reducing __copy_... callsites, strn*... stuff, etc. - there will be a
  pile about as large as this one in the next merge window.

  This one sat in -next for weeks. -3KLoC"

* 'work.uaccess' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (96 commits)
  HAVE_ARCH_HARDENED_USERCOPY is unconditional now
  CONFIG_ARCH_HAS_RAW_COPY_USER is unconditional now
  m32r: switch to RAW_COPY_USER
  hexagon: switch to RAW_COPY_USER
  microblaze: switch to RAW_COPY_USER
  get rid of padding, switch to RAW_COPY_USER
  ia64: get rid of copy_in_user()
  ia64: sanitize __access_ok()
  ia64: get rid of 'segment' argument of __do_{get,put}_user()
  ia64: get rid of 'segment' argument of __{get,put}_user_check()
  ia64: add extable.h
  powerpc: get rid of zeroing, switch to RAW_COPY_USER
  esas2r: don't open-code memdup_user()
  alpha: fix stack smashing in old_adjtimex(2)
  don't open-code kernel_setsockopt()
  mips: switch to RAW_COPY_USER
  mips: get rid of tail-zeroing in primitives
  mips: make copy_from_user() zero tail explicitly
  mips: clean and reorder the forest of macros...
  mips: consolidate __invoke_... wrappers
  ...
---

5db6db0d400edd8bec274e34960cfa22838e1df5
diff --cc arch/sparc/Kconfig
index 3db2543733a5,b577dbff5efb..ed96869c4101
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@@ -42,8 -42,7 +42,7 @@@ config SPAR
  	select OLD_SIGSUSPEND
  	select ARCH_HAS_SG_CHAIN
  	select CPU_NO_EFFICIENT_FFS
- 	select HAVE_ARCH_HARDENED_USERCOPY
 -	select PROVE_LOCKING_SMALL if PROVE_LOCKING
 +	select LOCKDEP_SMALL if LOCKDEP
  	select ARCH_WANT_RELAX_ORDER
  
  config SPARC32