commit 6b5856aa7da263887e5d184b64a59012f8816fdf
author Kees Cook <keescook@chromium.org> Thu Jun 23 15:20:59 2016 -0700
committer Amit Pundir <amit.pundir@linaro.org> Fri Oct 28 21:08:45 2016 +0800
tree dd3f9f7e1f1eb8739da657de9d59cebfa2469311
parent 35136e14efed3344a46356db94c71ce41167f2b0

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>

init/Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 81c218b..5981f38 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1710,6 +1710,7 @@
 
 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