summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2016-06-23 15:24:05 -0700
committerKees Cook <keescook@chromium.org>2016-07-26 14:43:54 -0700
commited18adc1cdd00a5c55a20fbdaed4804660772281 (patch)
tree652ad77b2d5e9ed24eb4782c2b270c7e7b4fc0c1 /init
parent04385fc5e8fffed84425d909a783c0f0c587d847 (diff)
downloadlinux-stable-ed18adc1cdd00a5c55a20fbdaed4804660772281.tar.gz
linux-stable-ed18adc1cdd00a5c55a20fbdaed4804660772281.tar.bz2
linux-stable-ed18adc1cdd00a5c55a20fbdaed4804660772281.zip
mm: SLUB hardened usercopy support
Under CONFIG_HARDENED_USERCOPY, this adds object size checking to the SLUB allocator to catch any copies that may span objects. Includes a redzone handling fix discovered by Michael Ellerman. Based on code from PaX and grsecurity. Signed-off-by: Kees Cook <keescook@chromium.org> Tested-by: Michael Ellerman <mpe@ellerman.id.au> Reviwed-by: Laura Abbott <labbott@redhat.com>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 1312d7b5a5fb..0c847063bb27 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1766,6 +1766,7 @@ config SLAB
config SLUB
bool "SLUB (Unqueued Allocator)"
+ select HAVE_HARDENED_USERCOPY_ALLOCATOR
help
SLUB is a slab allocator that minimizes cache line usage
instead of managing queues of cached objects (SLAB approach).