diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-08 17:48:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-08 17:48:14 -0400 |
commit | 1eccfa090eaea22558570054bbdc147817e1df5e (patch) | |
tree | a0adfdb87319abef88f575ee34314649193b7e92 /arch/Kconfig | |
parent | 1bd4403d86a1c06cb6cc9ac87664a0c9d3413d51 (diff) | |
parent | ed18adc1cdd00a5c55a20fbdaed4804660772281 (diff) |
Merge tag 'usercopy-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull usercopy protection from Kees Cook:
"Tbhis implements HARDENED_USERCOPY verification of copy_to_user and
copy_from_user bounds checking for most architectures on SLAB and
SLUB"
* tag 'usercopy-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
mm: SLUB hardened usercopy support
mm: SLAB hardened usercopy support
s390/uaccess: Enable hardened usercopy
sparc/uaccess: Enable hardened usercopy
powerpc/uaccess: Enable hardened usercopy
ia64/uaccess: Enable hardened usercopy
arm64/uaccess: Enable hardened usercopy
ARM: uaccess: Enable hardened usercopy
x86/uaccess: Enable hardened usercopy
mm: Hardened usercopy
mm: Implement stack frame object validation
mm: Add is_migrate_cma_page
Diffstat (limited to 'arch/Kconfig')
-rw-r--r-- | arch/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index bd8056b5b246..e9c9334507dd 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
@@ -461,6 +461,15 @@ config CC_STACKPROTECTOR_STRONG | |||
461 | 461 | ||
462 | endchoice | 462 | endchoice |
463 | 463 | ||
464 | config HAVE_ARCH_WITHIN_STACK_FRAMES | ||
465 | bool | ||
466 | help | ||
467 | An architecture should select this if it can walk the kernel stack | ||
468 | frames to determine if an object is part of either the arguments | ||
469 | or local variables (i.e. that it excludes saved return addresses, | ||
470 | and similar) by implementing an inline arch_within_stack_frames(), | ||
471 | which is used by CONFIG_HARDENED_USERCOPY. | ||
472 | |||
464 | config HAVE_CONTEXT_TRACKING | 473 | config HAVE_CONTEXT_TRACKING |
465 | bool | 474 | bool |
466 | help | 475 | help |