aboutsummaryrefslogtreecommitdiffstats
path: root/security/Kconfig
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2010-11-29 08:27:07 +1100
committerJames Morris <jmorris@namei.org>2010-11-29 08:27:07 +1100
commit1d6d75684d869406e5bb2ac5d3ed9454f52d0cab (patch)
treeafb229254bed6415407b7b7d4641f9f792109966 /security/Kconfig
parentkernel: add roundup() code comment from akpm (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 (diff)
downloadlinux-dev-1d6d75684d869406e5bb2ac5d3ed9454f52d0cab.tar.xz
linux-dev-1d6d75684d869406e5bb2ac5d3ed9454f52d0cab.zip
Merge branch 'master' into next
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 bd72ae623494..e80da955e687 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