diff options
| author |   Kees Cook <keescook@chromium.org> | 2018-10-01 17:08:57 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2019-01-08 13:18:43 -0800 |
| commit | 0102fb83f90050b86ce37aec810ea17bb4448e0c (patch) | |
| tree | 358b34fa8f9ece6d7880aae1b233a802d7462e03 /security/apparmor/lsm.c | |
| parent | LSM: Separate idea of "major" LSM from "exclusive" LSM (diff) | |
| download | linux-dev-0102fb83f90050b86ce37aec810ea17bb4448e0c.tar.xz linux-dev-0102fb83f90050b86ce37aec810ea17bb4448e0c.zip | |
apparmor: Remove SECURITY_APPARMOR_BOOTPARAM_VALUE
In preparation for removing CONFIG_DEFAULT_SECURITY, this removes the
soon-to-be redundant SECURITY_APPARMOR_BOOTPARAM_VALUE. Since explicit
ordering via CONFIG_LSM or "lsm=" will define whether an LSM is enabled or
not, this CONFIG will become effectively ignored, so remove it. However,
in order to stay backward-compatible with "security=apparmor", the enable
variable defaults to true.
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to '')
| -rw-r--r-- | security/apparmor/lsm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 149a3e16b5da..cda345767cfc 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -1333,7 +1333,7 @@ bool aa_g_paranoid_load = true; module_param_named(paranoid_load, aa_g_paranoid_load, aabool, S_IRUGO); /* Boot time disable flag */ -static int apparmor_enabled = CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE; +static int apparmor_enabled __lsm_ro_after_init = 1; module_param_named(enabled, apparmor_enabled, int, 0444); static int __init apparmor_enabled_setup(char *str) |