diff options
| author | Kees Cook | 2016-06-23 17:24:05 -0500 |
|---|---|---|
| committer | Kees Cook | 2016-07-26 16:43:54 -0500 |
| commit | ed18adc1cdd00a5c55a20fbdaed4804660772281 (patch) | |
| tree | 652ad77b2d5e9ed24eb4782c2b270c7e7b4fc0c1 /init/Kconfig | |
| parent | 04385fc5e8fffed84425d909a783c0f0c587d847 (diff) | |
| download | kernel-ed18adc1cdd00a5c55a20fbdaed4804660772281.tar.gz kernel-ed18adc1cdd00a5c55a20fbdaed4804660772281.tar.xz kernel-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/Kconfig')
| -rw-r--r-- | init/Kconfig | 1 |
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 | |||
| 1766 | 1766 | ||
| 1767 | config SLUB | 1767 | config SLUB |
| 1768 | bool "SLUB (Unqueued Allocator)" | 1768 | bool "SLUB (Unqueued Allocator)" |
| 1769 | select HAVE_HARDENED_USERCOPY_ALLOCATOR | ||
| 1769 | help | 1770 | help |
| 1770 | SLUB is a slab allocator that minimizes cache line usage | 1771 | SLUB is a slab allocator that minimizes cache line usage |
| 1771 | instead of managing queues of cached objects (SLAB approach). | 1772 | instead of managing queues of cached objects (SLAB approach). |