diff options
| author |   Kees Cook <keescook@chromium.org> | 2018-09-13 23:17:50 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2019-01-08 13:18:42 -0800 |
| commit | f4941d75b9cba5e1fae1aebe0139dcca0703a294 (patch) | |
| tree | fca97d9b39b5291c138795b7e6262faba2dbec5b /security/smack | |
| parent | LSM: Plumb visibility into optional "enabled" state (diff) | |
| download | linux-dev-f4941d75b9cba5e1fae1aebe0139dcca0703a294.tar.xz linux-dev-f4941d75b9cba5e1fae1aebe0139dcca0703a294.zip | |
LSM: Lift LSM selection out of individual LSMs
As a prerequisite to adjusting LSM selection logic in the future, this
moves the selection logic up out of the individual major LSMs, making
their init functions only run when actually enabled. This considers all
LSMs enabled by default unless they specified an external "enable"
variable.
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Casey Schaufler <casey@schaufler-ca.com>
Reviewed-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/smack')
| -rw-r--r-- | security/smack/smack_lsm.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index d72d215d7fde..580e9d6e5680 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -4762,9 +4762,6 @@ static __init int smack_init(void) struct cred *cred; struct task_smack *tsp; - if (!security_module_enable("smack")) - return 0; - smack_inode_cache = KMEM_CACHE(inode_smack, 0); if (!smack_inode_cache) return -ENOMEM; |