diff options
author | Kees Cook <keescook@chromium.org> | 2018-10-10 20:18:21 -0400 |
---|---|---|
committer | James Morris <james.morris@microsoft.com> | 2018-10-10 23:40:21 -0400 |
commit | 5b89c1bd4c7e5c5ca8c5374fde35ecee6e16496c (patch) | |
tree | 1149bf533d702366169684a6ea71254f2d8917d6 /include/linux/init.h | |
parent | 6907e3746fa1b9b685230098266bbeba99b93c7d (diff) |
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 'include/linux/init.h')
-rw-r--r-- | include/linux/init.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index 77636539e77c..9c2aba1dbabf 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
@@ -133,7 +133,6 @@ static inline initcall_t initcall_from_entry(initcall_entry_t *entry) | |||
133 | #endif | 133 | #endif |
134 | 134 | ||
135 | extern initcall_entry_t __con_initcall_start[], __con_initcall_end[]; | 135 | extern initcall_entry_t __con_initcall_start[], __con_initcall_end[]; |
136 | extern initcall_entry_t __start_lsm_info[], __end_lsm_info[]; | ||
137 | 136 | ||
138 | /* Used for contructor calls. */ | 137 | /* Used for contructor calls. */ |
139 | typedef void (*ctor_fn_t)(void); | 138 | typedef void (*ctor_fn_t)(void); |
@@ -236,7 +235,6 @@ extern bool initcall_debug; | |||
236 | static exitcall_t __exitcall_##fn __exit_call = fn | 235 | static exitcall_t __exitcall_##fn __exit_call = fn |
237 | 236 | ||
238 | #define console_initcall(fn) ___define_initcall(fn,, .con_initcall) | 237 | #define console_initcall(fn) ___define_initcall(fn,, .con_initcall) |
239 | #define security_initcall(fn) ___define_initcall(fn,, .lsm_info) | ||
240 | 238 | ||
241 | struct obs_kernel_param { | 239 | struct obs_kernel_param { |
242 | const char *str; | 240 | const char *str; |