diff options
author | Kees Cook <keescook@chromium.org> | 2015-07-24 04:02:48 +0300 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2015-07-28 06:18:19 +0300 |
commit | 730daa164e7c7e31c08fab940549f4acc3329432 (patch) | |
tree | 8c125b404c785f8de46a04d4f43fccef6744f0a8 /include | |
parent | fe6c59dc17908effd4e2caa666795b9ad984005b (diff) | |
download | linux-730daa164e7c7e31c08fab940549f4acc3329432.tar.xz |
Yama: remove needless CONFIG_SECURITY_YAMA_STACKED
Now that minor LSMs can cleanly stack with major LSMs, remove the unneeded
config for Yama to be made to explicitly stack. Just selecting the main
Yama CONFIG will allow it to work, regardless of the major LSM. Since
distros using Yama are already forcing it to stack, this is effectively
a no-op change.
Additionally add MAINTAINERS entry.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/lsm_hooks.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index 9429f054c323..ec3a6bab29de 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -1881,8 +1881,10 @@ static inline void security_delete_hooks(struct security_hook_list *hooks, extern int __init security_module_enable(const char *module); extern void __init capability_add_hooks(void); -#ifdef CONFIG_SECURITY_YAMA_STACKED -void __init yama_add_hooks(void); +#ifdef CONFIG_SECURITY_YAMA +extern void __init yama_add_hooks(void); +#else +static inline void __init yama_add_hooks(void) { } #endif #endif /* ! __LINUX_LSM_HOOKS_H */ |