diff options
author | James Morris <james.l.morris@oracle.com> | 2017-05-22 16:32:40 +1000 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2017-05-22 16:32:40 +1000 |
commit | d68c51e0b377838dd31b37707813bb62089f399c (patch) | |
tree | 4557d5ced33ea6da60bc84ee288af9924192f046 /security/Kconfig | |
parent | 99c55fb18fc48508ae5bba57146a556aacc4558c (diff) | |
parent | 08332893e37af6ae779367e78e444f8f9571511d (diff) | |
download | linux-d68c51e0b377838dd31b37707813bb62089f399c.tar.gz linux-d68c51e0b377838dd31b37707813bb62089f399c.tar.bz2 linux-d68c51e0b377838dd31b37707813bb62089f399c.zip |
Sync to mainline for security submaintainers to work against
Diffstat (limited to 'security/Kconfig')
-rw-r--r-- | security/Kconfig | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/security/Kconfig b/security/Kconfig index 823ca1aafd09..bdcbb92927ab 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -130,17 +130,8 @@ config HAVE_HARDENED_USERCOPY_ALLOCATOR validating memory ranges against heap object sizes in support of CONFIG_HARDENED_USERCOPY. -config HAVE_ARCH_HARDENED_USERCOPY - bool - help - The architecture supports CONFIG_HARDENED_USERCOPY by - calling check_object_size() just before performing the - userspace copies in the low level implementation of - copy_to_user() and copy_from_user(). - config HARDENED_USERCOPY bool "Harden memory copies between kernel and userspace" - depends on HAVE_ARCH_HARDENED_USERCOPY depends on HAVE_HARDENED_USERCOPY_ALLOCATOR select BUG help |