diff options
| author | Kees Cook <keescook@chromium.org> | 2018-10-11 02:18:21 +0200 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-10-11 05:40:21 +0200 |
| commit | 5b89c1bd4c7e5c5ca8c5374fde35ecee6e16496c (patch) | |
| tree | 1149bf533d702366169684a6ea71254f2d8917d6 /security | |
| parent | LSM: Remove initcall tracing (diff) | |
| download | linux-5b89c1bd4c7e5c5ca8c5374fde35ecee6e16496c.tar.xz linux-5b89c1bd4c7e5c5ca8c5374fde35ecee6e16496c.zip | |
LSM: Convert from initcall to struct lsm_info
In preparation for doing more interesting LSM init probing, this converts
the existing initcall system into an explicit call into a function pointer
from a section-collected struct lsm_info array.
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Casey Schaufler <casey@schaufler-ca.com>
Reviewed-by: James Morris <james.morris@microsoft.com>
Reviewed-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <james.morris@microsoft.com>
Diffstat (limited to 'security')
| -rw-r--r-- | security/integrity/iint.c | 1 | ||||
| -rw-r--r-- | security/security.c | 14 |
2 files changed, 6 insertions, 9 deletions
diff --git a/security/integrity/iint.c b/security/integrity/iint.c index 5a6810041e5c..70d21b566955 100644 --- a/security/integrity/iint.c +++ b/security/integrity/iint.c @@ -22,6 +22,7 @@ #include <linux/file.h> #include <linux/uaccess.h> #include <linux/security.h> +#include <linux/lsm_hooks.h> #include "integrity.h" static struct rb_root integrity_iint_tree = RB_ROOT; diff --git a/security/security.c b/security/security.c index 41a5da2c7faf..e74f46fba591 100644 --- a/security/security.c +++ b/security/security.c @@ -43,16 +43,12 @@ char *lsm_names; static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] = CONFIG_DEFAULT_SECURITY; -static void __init do_security_initcalls(void) +static void __init major_lsm_init(void) { - initcall_t call; - initcall_entry_t *ce; + struct lsm_info *lsm; - ce = __start_lsm_info; - while (ce < __end_lsm_info) { - call = initcall_from_entry(ce); - call(); - ce++; + for (lsm = __start_lsm_info; lsm < __end_lsm_info; lsm++) { + lsm->init(); } } @@ -82,7 +78,7 @@ int __init security_init(void) /* * Load all the remaining security modules. */ - do_security_initcalls(); + major_lsm_init(); return 0; } |