diff options
Diffstat (limited to 'security/Kconfig')
-rw-r--r-- | security/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/security/Kconfig b/security/Kconfig index 226b9556b25f..bd72ae623494 100644 --- a/security/Kconfig +++ b/security/Kconfig | |||
@@ -140,6 +140,7 @@ config LSM_MMAP_MIN_ADDR | |||
140 | source security/selinux/Kconfig | 140 | source security/selinux/Kconfig |
141 | source security/smack/Kconfig | 141 | source security/smack/Kconfig |
142 | source security/tomoyo/Kconfig | 142 | source security/tomoyo/Kconfig |
143 | source security/apparmor/Kconfig | ||
143 | 144 | ||
144 | source security/integrity/ima/Kconfig | 145 | source security/integrity/ima/Kconfig |
145 | 146 | ||
@@ -148,6 +149,7 @@ choice | |||
148 | default DEFAULT_SECURITY_SELINUX if SECURITY_SELINUX | 149 | default DEFAULT_SECURITY_SELINUX if SECURITY_SELINUX |
149 | default DEFAULT_SECURITY_SMACK if SECURITY_SMACK | 150 | default DEFAULT_SECURITY_SMACK if SECURITY_SMACK |
150 | default DEFAULT_SECURITY_TOMOYO if SECURITY_TOMOYO | 151 | default DEFAULT_SECURITY_TOMOYO if SECURITY_TOMOYO |
152 | default DEFAULT_SECURITY_APPARMOR if SECURITY_APPARMOR | ||
151 | default DEFAULT_SECURITY_DAC | 153 | default DEFAULT_SECURITY_DAC |
152 | 154 | ||
153 | help | 155 | help |
@@ -163,6 +165,9 @@ choice | |||
163 | config DEFAULT_SECURITY_TOMOYO | 165 | config DEFAULT_SECURITY_TOMOYO |
164 | bool "TOMOYO" if SECURITY_TOMOYO=y | 166 | bool "TOMOYO" if SECURITY_TOMOYO=y |
165 | 167 | ||
168 | config DEFAULT_SECURITY_APPARMOR | ||
169 | bool "AppArmor" if SECURITY_APPARMOR=y | ||
170 | |||
166 | config DEFAULT_SECURITY_DAC | 171 | config DEFAULT_SECURITY_DAC |
167 | bool "Unix Discretionary Access Controls" | 172 | bool "Unix Discretionary Access Controls" |
168 | 173 | ||
@@ -173,6 +178,7 @@ config DEFAULT_SECURITY | |||
173 | default "selinux" if DEFAULT_SECURITY_SELINUX | 178 | default "selinux" if DEFAULT_SECURITY_SELINUX |
174 | default "smack" if DEFAULT_SECURITY_SMACK | 179 | default "smack" if DEFAULT_SECURITY_SMACK |
175 | default "tomoyo" if DEFAULT_SECURITY_TOMOYO | 180 | default "tomoyo" if DEFAULT_SECURITY_TOMOYO |
181 | default "apparmor" if DEFAULT_SECURITY_APPARMOR | ||
176 | default "" if DEFAULT_SECURITY_DAC | 182 | default "" if DEFAULT_SECURITY_DAC |
177 | 183 | ||
178 | endmenu | 184 | endmenu |