summaryrefslogtreecommitdiffstats
path: root/security/Kconfig
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-12 09:18:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-12 09:18:04 +0200
commit8473054e4d2581282230d01d1ae5379cdcf7a4df (patch)
tree4606408a26ebd621ff799ffbc6f07126f7fba6b4 /security/Kconfig
parentstaging: Remove rtl8723au driver (diff)
parentLinux 4.8-rc6 (diff)
downloadlinux-8473054e4d2581282230d01d1ae5379cdcf7a4df.tar.xz
linux-8473054e4d2581282230d01d1ae5379cdcf7a4df.zip
Merge 4.8-rc6 into staging-next
We need the IIO changes in here for future patches to build on. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security/Kconfig')
-rw-r--r--security/Kconfig11
1 files changed, 11 insertions, 0 deletions
diff --git a/security/Kconfig b/security/Kconfig
index da10d9b573a4..118f4549404e 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -147,6 +147,17 @@ config HARDENED_USERCOPY
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 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