summaryrefslogtreecommitdiffstats
path: root/security/apparmor/lsm.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2018-10-11 02:18:23 +0200
committerJames Morris <james.morris@microsoft.com>2018-10-11 05:40:21 +0200
commit3d6e5f6dcf6561e57b6466e43e14029fb196028d (patch)
tree829be56c4ecc3bf4bc9b4c9726977c6ad83fe010 /security/apparmor/lsm.c
parentvmlinux.lds.h: Move LSM_TABLE into INIT_DATA (diff)
downloadlinux-3d6e5f6dcf6561e57b6466e43e14029fb196028d.tar.xz
linux-3d6e5f6dcf6561e57b6466e43e14029fb196028d.zip
LSM: Convert security_initcall() into DEFINE_LSM()
Instead of using argument-based initializers, switch to defining the contents of struct lsm_info on a per-LSM basis. This also drops the final use of the now inaccurate "initcall" naming. Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-by: Casey Schaufler <casey@schaufler-ca.com> Reviewed-by: James Morris <james.morris@microsoft.com> Signed-off-by: James Morris <james.morris@microsoft.com>
Diffstat (limited to 'security/apparmor/lsm.c')
-rw-r--r--security/apparmor/lsm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 8b8b70620bbe..c4863956c832 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -1606,4 +1606,6 @@ alloc_out:
return error;
}
-security_initcall(apparmor_init);
+DEFINE_LSM(apparmor) = {
+ .init = apparmor_init,
+};