lkml.org 
[lkml]   [2018]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 19/38] capability: Initialize as LSM_ORDER_FIRST
    Date
    From: Kees Cook <keescook@chromium.org>

    This converts capabilities to use the new LSM_ORDER_FIRST position.

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

    diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
    index 83858e3df9e5..15fc49ee41a1 100644
    --- a/include/linux/lsm_hooks.h
    +++ b/include/linux/lsm_hooks.h
    @@ -2092,6 +2092,4 @@ static inline void security_delete_hooks(struct security_hook_list *hooks,
    #define __lsm_ro_after_init __ro_after_init
    #endif /* CONFIG_SECURITY_WRITABLE_HOOKS */

    -extern void __init capability_add_hooks(void);
    -
    #endif /* ! __LINUX_LSM_HOOKS_H */
    diff --git a/security/commoncap.c b/security/commoncap.c
    index 18a4fdf6f6eb..ec387535e597 100644
    --- a/security/commoncap.c
    +++ b/security/commoncap.c
    @@ -1363,10 +1363,17 @@ struct security_hook_list capability_hooks[] __lsm_ro_after_init = {
    LSM_HOOK_INIT(vm_enough_memory, cap_vm_enough_memory),
    };

    -void __init capability_add_hooks(void)
    +static int __init capability_init(void)
    {
    security_add_hooks(capability_hooks, ARRAY_SIZE(capability_hooks),
    "capability");
    + return 0;
    }

    +DEFINE_LSM(capability) = {
    + .name = "capability",
    + .order = LSM_ORDER_FIRST,
    + .init = capability_init,
    +};
    +
    #endif /* CONFIG_SECURITY */
    diff --git a/security/security.c b/security/security.c
    index 701507174f40..eab64bdc60fb 100644
    --- a/security/security.c
    +++ b/security/security.c
    @@ -277,11 +277,6 @@ int __init security_init(void)
    i++)
    INIT_HLIST_HEAD(&list[i]);

    - /*
    - * Load minor LSMs, with the capability module always first.
    - */
    - capability_add_hooks();
    -
    /* Load LSMs in specified order. */
    ordered_lsm_init();

    --
    2.14.5
    \
     
     \ /
      Last update: 2018-12-11 23:44    [W:4.185 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site