From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Sep 2016 21:03:49 +0000 (-0700)
Subject: Merge tag 'usercopy-v4.8-rc6-part2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=80a77045daacc660659093b312ca0708b53ed558;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'usercopy-v4.8-rc6-part2' of git://git./linux/kernel/git/kees/linux

Pull more hardened usercopyfixes from Kees Cook:

 - force check_object_size() to be inline too

 - move page-spanning check behind a CONFIG since it's triggering false
   positives

[ Changed the page-spanning config option to depend on EXPERT in the
  merge.  That way it still gets build testing, and you can enable it if
  you want to, but is never enabled for "normal" configurations ]

* tag 'usercopy-v4.8-rc6-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  usercopy: remove page-spanning test for now
  usercopy: force check_object_size() inline
---

80a77045daacc660659093b312ca0708b53ed558
diff --cc security/Kconfig
index da10d9b573a4,2dfc0ce4083e..118f4549404e
--- a/security/Kconfig
+++ b/security/Kconfig
@@@ -147,6 -147,17 +147,17 @@@ config HARDENED_USERCOP
  	  or are part of the kernel text. This kills entire classes
  	  of heap overflow exploits and similar kernel memory exposures.
  
+ config HARDENED_USERCOPY_PAGESPAN
+ 	bool "Refuse to copy allocations that span multiple pages"
+ 	depends on HARDENED_USERCOPY
 -	depends on !COMPILE_TEST
++	depends on EXPERT
+ 	help
+ 	  When a multi-page allocation is done without __GFP_COMP,
+ 	  hardened usercopy will reject attempts to copy it. There are,
+ 	  however, several cases of this in the kernel that have not all
+ 	  been removed. This config is intended to be used only while
+ 	  trying to find such users.
+ 
  source security/selinux/Kconfig
  source security/smack/Kconfig
  source security/tomoyo/Kconfig