diff options
| author |   Kees Cook <keescook@chromium.org> | 2018-10-10 17:18:23 -0700 |
|---|---|---|
| committer |   James Morris <james.morris@microsoft.com> | 2018-10-10 20:40:21 -0700 |
| commit | 3d6e5f6dcf6561e57b6466e43e14029fb196028d (patch) | |
| tree | 829be56c4ecc3bf4bc9b4c9726977c6ad83fe010 /include/linux/lsm_hooks.h | |
| parent | vmlinux.lds.h: Move LSM_TABLE into INIT_DATA (diff) | |
| download | linux-dev-3d6e5f6dcf6561e57b6466e43e14029fb196028d.tar.xz linux-dev-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 'include/linux/lsm_hooks.h')
| -rw-r--r-- | include/linux/lsm_hooks.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index d13059feca09..9c6b4198ff5a 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -2045,11 +2045,10 @@ struct lsm_info { extern struct lsm_info __start_lsm_info[], __end_lsm_info[]; -#define security_initcall(lsm) \ +#define DEFINE_LSM(lsm) \ static struct lsm_info __lsm_##lsm \ __used __section(.lsm_info.init) \ - __aligned(sizeof(unsigned long)) \ - = { .init = lsm, } + __aligned(sizeof(unsigned long)) #ifdef CONFIG_SECURITY_SELINUX_DISABLE /* |