summaryrefslogtreecommitdiff
path: root/security/Kconfig
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2010-11-24 18:30:28 (GMT)
committerChris Metcalf <cmetcalf@tilera.com>2010-11-24 18:30:28 (GMT)
commitb03a6c4c7d8ebd8118d668eafdb85f5f76b5437f (patch)
treef6ca7059e9c1bc1aac9a6741316f8e07ba349f7f /security/Kconfig
parent24f3f6b5eff92608a62449e33bfac0eed1447d02 (diff)
parent3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff)
downloadlinux-fsl-qoriq-b03a6c4c7d8ebd8118d668eafdb85f5f76b5437f.tar.xz
Merge branch 'master' into for-linus
Diffstat (limited to 'security/Kconfig')
-rw-r--r--security/Kconfig12
1 files changed, 12 insertions, 0 deletions
diff --git a/security/Kconfig b/security/Kconfig
index bd72ae6..e80da95 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -39,6 +39,18 @@ config KEYS_DEBUG_PROC_KEYS
If you are unsure as to whether this is required, answer N.
+config SECURITY_DMESG_RESTRICT
+ bool "Restrict unprivileged access to the kernel syslog"
+ default n
+ help
+ This enforces restrictions on unprivileged users reading the kernel
+ syslog via dmesg(8).
+
+ If this option is not selected, no restrictions will be enforced
+ unless the dmesg_restrict sysctl is explicitly set to (1).
+
+ If you are unsure how to answer this question, answer N.
+
config SECURITY
bool "Enable different security models"
depends on SYSFS