diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-15 14:08:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-15 14:08:27 -0400 |
| commit | d488d3a4ce08e96dad5cb3b6117517d57ccec98f (patch) | |
| tree | 169b09c589e38f6d5f2ea0a9e25c6a9fb3ebf783 /security/yama/Kconfig | |
| parent | cb906953d2c3fd450655d9fa833f03690ad50c23 (diff) | |
| parent | 5deeb5cece3f9b30c8129786726b9d02c412c8ca (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem updates from James Morris:
"Highlights for this window:
- improved AVC hashing for SELinux by John Brooks and Stephen Smalley
- addition of an unconfined label to Smack
- Smack documentation update
- TPM driver updates"
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (28 commits)
lsm: copy comm before calling audit_log to avoid race in string printing
tomoyo: Do not generate empty policy files
tomoyo: Use if_changed when generating builtin-policy.h
tomoyo: Use bin2c to generate builtin-policy.h
selinux: increase avtab max buckets
selinux: Use a better hash function for avtab
selinux: convert avtab hash table to flex_array
selinux: reconcile security_netlbl_secattr_to_sid() and mls_import_netlbl_cat()
selinux: remove unnecessary pointer reassignment
Smack: Updates for Smack documentation
tpm/st33zp24/spi: Add missing device table for spi phy.
tpm/st33zp24: Add proper wait for ordinal duration in case of irq mode
smack: Fix gcc warning from unused smack_syslog_lock mutex in smackfs.c
Smack: Allow an unconfined label in bringup mode
Smack: getting the Smack security context of keys
Smack: Assign smack_known_web as default smk_in label for kernel thread's socket
tpm/tpm_infineon: Use struct dev_pm_ops for power management
MAINTAINERS: Add Jason as designated reviewer for TPM
tpm: Update KConfig text to include TPM2.0 FIFO chips
tpm/st33zp24/dts/st33zp24-spi: Add dts documentation for st33zp24 spi phy
...
Diffstat (limited to 'security/yama/Kconfig')
| -rw-r--r-- | security/yama/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/security/yama/Kconfig b/security/yama/Kconfig index 20ef5143c0c0..3123e1da2fed 100644 --- a/security/yama/Kconfig +++ b/security/yama/Kconfig | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | config SECURITY_YAMA | 1 | config SECURITY_YAMA |
| 2 | bool "Yama support" | 2 | bool "Yama support" |
| 3 | depends on SECURITY | 3 | depends on SECURITY |
| 4 | select SECURITYFS | ||
| 5 | select SECURITY_PATH | ||
| 6 | default n | 4 | default n |
| 7 | help | 5 | help |
| 8 | This selects Yama, which extends DAC support with additional | 6 | This selects Yama, which extends DAC support with additional |