diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-19 06:49:35 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-19 06:49:35 -0500 |
| commit | 9e18e1869f5ebac69f0d881fe97a198ebc0834db (patch) | |
| tree | 18c5b5c185d39cbb50fa652b5e08d047c8cf06e1 /security/Kconfig | |
| parent | 04af964f9cb666caa7c1436d003f8fac0f1fedcc (diff) | |
| parent | 460ed699f4c943e1ec4a8458869eb532fe31fd16 (diff) | |
Merge branch 'next-samsung-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into for-2.6.38
Diffstat (limited to 'security/Kconfig')
| -rw-r--r-- | security/Kconfig | 12 |
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 | |||
| 39 | 39 | ||
| 40 | If you are unsure as to whether this is required, answer N. | 40 | If you are unsure as to whether this is required, answer N. |
| 41 | 41 | ||
| 42 | config SECURITY_DMESG_RESTRICT | ||
| 43 | bool "Restrict unprivileged access to the kernel syslog" | ||
| 44 | default n | ||
| 45 | help | ||
| 46 | This enforces restrictions on unprivileged users reading the kernel | ||
| 47 | syslog via dmesg(8). | ||
| 48 | |||
| 49 | If this option is not selected, no restrictions will be enforced | ||
| 50 | unless the dmesg_restrict sysctl is explicitly set to (1). | ||
| 51 | |||
| 52 | If you are unsure how to answer this question, answer N. | ||
| 53 | |||
| 42 | config SECURITY | 54 | config SECURITY |
| 43 | bool "Enable different security models" | 55 | bool "Enable different security models" |
| 44 | depends on SYSFS | 56 | depends on SYSFS |