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 12/38] apparmor: Remove SECURITY_APPARMOR_BOOTPARAM_VALUE
    Date
    From: Kees Cook <keescook@chromium.org>

    In preparation for removing CONFIG_DEFAULT_SECURITY, this removes the
    soon-to-be redundant SECURITY_APPARMOR_BOOTPARAM_VALUE. Since explicit
    ordering via CONFIG_LSM or "lsm=" will define whether an LSM is enabled or
    not, this CONFIG will become effectively ignored, so remove it. However,
    in order to stay backward-compatible with "security=apparmor", the enable
    variable defaults to true.

    Signed-off-by: Kees Cook <keescook@chromium.org>
    ---
    security/apparmor/Kconfig | 16 ----------------
    security/apparmor/lsm.c | 2 +-
    2 files changed, 1 insertion(+), 17 deletions(-)

    diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig
    index b6b68a7750ce..3de21f46c82a 100644
    --- a/security/apparmor/Kconfig
    +++ b/security/apparmor/Kconfig
    @@ -14,22 +14,6 @@ config SECURITY_APPARMOR

    If you are unsure how to answer this question, answer N.

    -config SECURITY_APPARMOR_BOOTPARAM_VALUE
    - int "AppArmor boot parameter default value"
    - depends on SECURITY_APPARMOR
    - range 0 1
    - default 1
    - help
    - This option sets the default value for the kernel parameter
    - 'apparmor', which allows AppArmor to be enabled or disabled
    - at boot. If this option is set to 0 (zero), the AppArmor
    - kernel parameter will default to 0, disabling AppArmor at
    - boot. If this option is set to 1 (one), the AppArmor
    - kernel parameter will default to 1, enabling AppArmor at
    - boot.
    -
    - If you are unsure how to answer this question, answer 1.
    -
    config SECURITY_APPARMOR_HASH
    bool "Enable introspection of sha1 hashes for loaded profiles"
    depends on SECURITY_APPARMOR
    diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
    index 37dafab649b1..e8b40008d58c 100644
    --- a/security/apparmor/lsm.c
    +++ b/security/apparmor/lsm.c
    @@ -1332,7 +1332,7 @@ bool aa_g_paranoid_load = true;
    module_param_named(paranoid_load, aa_g_paranoid_load, aabool, S_IRUGO);

    /* Boot time disable flag */
    -static int apparmor_enabled = CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE;
    +static int apparmor_enabled __lsm_ro_after_init = 1;
    module_param_named(enabled, apparmor_enabled, int, 0444);

    static int __init apparmor_enabled_setup(char *str)
    --
    2.14.5
    \
     
     \ /
      Last update: 2018-12-11 23:48    [W:4.720 / U:0.356 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site