diff options
author | Kees Cook <keescook@chromium.org> | 2016-06-23 15:20:59 -0700 |
---|---|---|
committer | Amit Pundir <amit.pundir@linaro.org> | 2016-10-28 22:57:54 +0800 |
commit | f5546b4745a4dcdcecf041e6ec55039b3d8adc83 (patch) | |
tree | d060a9e83d867e372389cbbc9c1955a56a60e25e /init | |
parent | 17574feabad247463adcd1ab78a3cf14539b76ce (diff) |
UPSTREAM: mm: SLAB hardened usercopy support
Under CONFIG_HARDENED_USERCOPY, this adds object size checking to the
SLAB allocator to catch any copies that may span objects.
Based on code from PaX and grsecurity.
Signed-off-by: Kees Cook <keescook@chromium.org>
Tested-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Change-Id: Ib910a71fdc2ab808e1a45b6d33e9bae1681a1f4a
(cherry picked from commit 04385fc5e8fffed84425d909a783c0f0c587d847)
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index e9e50041bc35..1de8fa474572 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1730,6 +1730,7 @@ choice config SLAB bool "SLAB" + select HAVE_HARDENED_USERCOPY_ALLOCATOR help The regular slab allocator that is established and known to work well in all environments. It organizes cache hot objects in |