Merge tag 'icc-5.20-rc1-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov...

[platform/kernel/linux-starfive.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index 9b2c492..f29e4c6 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -160,20 +160,9 @@ config HARDENED_USERCOPY
          copy_from_user() functions) by rejecting memory ranges that
          are larger than the specified heap object, span multiple
          separately allocated pages, are not on the process stack,
-         or are part of the kernel text. This kills entire classes
+         or are part of the kernel text. This prevents entire classes
          of heap overflow exploits and similar kernel memory exposures.
 
-config HARDENED_USERCOPY_PAGESPAN
-       bool "Refuse to copy allocations that span multiple pages"
-       depends on HARDENED_USERCOPY
-       depends on BROKEN
-       help
-         When a multi-page allocation is done without __GFP_COMP,
-         hardened usercopy will reject attempts to copy it. There are,
-         however, several cases of this in the kernel that have not all
-         been removed. This config is intended to be used only while
-         trying to find such users.
-
 config FORTIFY_SOURCE
        bool "Harden common str/mem functions against buffer overflows"
        depends on ARCH_HAS_FORTIFY_SOURCE