Revert "MALI: midgard: RK: not to power off all the pm cores"

[firefly-linux-kernel-4.4.55.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index 46c00a674eecc316ba4be08d49b036010269d500..3aa60791f84d687eeab11e5b437e9e37c039d32c 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -18,6 +18,15 @@ config SECURITY_DMESG_RESTRICT
 
          If you are unsure how to answer this question, answer N.
 
 
          If you are unsure how to answer this question, answer N.
 

+config SECURITY_PERF_EVENTS_RESTRICT
+       bool "Restrict unprivileged use of performance events"
+       depends on PERF_EVENTS
+       help
+         If you say Y here, the kernel.perf_event_paranoid sysctl
+         will be set to 3 by default, and no unprivileged use of the
+         perf_event_open syscall will be permitted unless it is
+         changed.
+

 config SECURITY
        bool "Enable different security models"
        depends on SYSFS
 config SECURITY
        bool "Enable different security models"
        depends on SYSFS


@@ -136,6 +145,7 @@ config HAVE_ARCH_HARDENED_USERCOPY
 config HARDENED_USERCOPY
        bool "Harden memory copies between kernel and userspace"
        depends on HAVE_ARCH_HARDENED_USERCOPY
 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
          This option checks for obviously wrong memory regions when
        select BUG
        help
          This option checks for obviously wrong memory regions when


@@ -146,6 +156,17 @@ config HARDENED_USERCOPY
          or are part of the kernel text. This kills entire classes
          of heap overflow exploits and similar kernel memory exposures.
 
          or are part of the kernel text. This kills 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 !COMPILE_TEST
+       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.
+

 source security/selinux/Kconfig
 source security/smack/Kconfig
 source security/tomoyo/Kconfig
 source security/selinux/Kconfig
 source security/smack/Kconfig
 source security/tomoyo/Kconfig