lkml.org 
[lkml]   [2018]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH v5 17/38] Yama: Initialize as ordered LSM
    From
    Date
    This converts Yama from being a direct "minor" LSM into an ordered LSM.

    Signed-off-by: Kees Cook <keescook@chromium.org>
    Reviewed-by: Casey Schaufler <casey@schaufler-ca.com>
    ---
    include/linux/lsm_hooks.h | 5 -----
    security/Kconfig | 2 +-
    security/security.c | 1 -
    security/yama/yama_lsm.c | 8 +++++++-
    4 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
    index b565c0c10269..6cfbd7d78a89 100644
    --- a/include/linux/lsm_hooks.h
    +++ b/include/linux/lsm_hooks.h
    @@ -2087,10 +2087,5 @@ static inline void security_delete_hooks(struct security_hook_list *hooks,
    #endif /* CONFIG_SECURITY_WRITABLE_HOOKS */

    extern void __init capability_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 */
    diff --git a/security/Kconfig b/security/Kconfig
    index 566d54215cbe..94a71e022b79 100644
    --- a/security/Kconfig
    +++ b/security/Kconfig
    @@ -241,7 +241,7 @@ source security/integrity/Kconfig

    config LSM
    string "Ordered list of enabled LSMs"
    - default "loadpin,integrity,selinux,smack,tomoyo,apparmor"
    + default "yama,loadpin,integrity,selinux,smack,tomoyo,apparmor"
    help
    A comma-separated list of LSMs, in initialization order.
    Any LSMs left off this list will be ignored. This can be
    diff --git a/security/security.c b/security/security.c
    index 0c092d62cc47..0c3c66dbf51c 100644
    --- a/security/security.c
    +++ b/security/security.c
    @@ -274,7 +274,6 @@ int __init security_init(void)
    * Load minor LSMs, with the capability module always first.
    */
    capability_add_hooks();
    - yama_add_hooks();

    /* Load LSMs in specified order. */
    ordered_lsm_init();
    diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
    index ffda91a4a1aa..eb1da1303d2e 100644
    --- a/security/yama/yama_lsm.c
    +++ b/security/yama/yama_lsm.c
    @@ -477,9 +477,15 @@ static void __init yama_init_sysctl(void)
    static inline void yama_init_sysctl(void) { }
    #endif /* CONFIG_SYSCTL */

    -void __init yama_add_hooks(void)
    +static int __init yama_init(void)
    {
    pr_info("Yama: becoming mindful.\n");
    security_add_hooks(yama_hooks, ARRAY_SIZE(yama_hooks), "yama");
    yama_init_sysctl();
    + return 0;
    }
    +
    +DEFINE_LSM(yama) = {
    + .name = "yama",
    + .init = yama_init,
    +};
    --
    2.14.5

    \
     
     \ /
      Last update: 2018-11-27 00:40    [W:4.091 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site