summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorKees Cook2016-06-24 00:04:01 +0200
committerKees Cook2016-07-26 23:41:48 +0200
commit5b710f34e194c6b7710f69fdb5d798fdf35b98c1 (patch)
treeed1e71a6c526cf24861803af7e48b81ce68e82b6 /arch/x86/Kconfig
parentmm: Hardened usercopy (diff)
downloadkernel-qcow2-linux-5b710f34e194c6b7710f69fdb5d798fdf35b98c1.tar.gz
kernel-qcow2-linux-5b710f34e194c6b7710f69fdb5d798fdf35b98c1.tar.xz
kernel-qcow2-linux-5b710f34e194c6b7710f69fdb5d798fdf35b98c1.zip
x86/uaccess: Enable hardened usercopy
Enables CONFIG_HARDENED_USERCOPY checks on x86. This is done both in copy_*_user() and __copy_*_user() because copy_*_user() actually calls down to _copy_*_user() and not __copy_*_user(). Based on code from PaX and grsecurity. Signed-off-by: Kees Cook <keescook@chromium.org> Tested-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index a2865ddfc1ff..9640942b68b9 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -80,6 +80,7 @@ config X86
select HAVE_ALIGNED_STRUCT_PAGE if SLUB
select HAVE_AOUT if X86_32
select HAVE_ARCH_AUDITSYSCALL
+ select HAVE_ARCH_HARDENED_USERCOPY
select HAVE_ARCH_HUGE_VMAP if X86_64 || X86_PAE
select HAVE_ARCH_JUMP_LABEL
select HAVE_ARCH_KASAN if X86_64 && SPARSEMEM_VMEMMAP