lkml.org 
[lkml]   [2022]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH -next] evm: Use IS_ENABLED to initialize .enabled
    From
    Date
    Hi, Ahmad

    在 2022/6/7 14:06, Ahmad Fatoum 写道:
    > On 06.06.22 12:10, Xiu Jianfeng wrote:
    >> Use IS_ENABLED(CONFIG_XXX) instead of #ifdef/#endif statements to
    >> initialize .enabled, minor simplicity improvement.
    >>
    >> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
    > Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
    thank you for the review, and I'm not sure if this patch has been
    picked, so frendly ping here...
    >> ---
    >> security/integrity/evm/evm_main.c | 52 ++++++++++++++-----------------
    >> 1 file changed, 23 insertions(+), 29 deletions(-)
    >>
    >> diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
    >> index cc88f02c7562..397fea5b3fa6 100644
    >> --- a/security/integrity/evm/evm_main.c
    >> +++ b/security/integrity/evm/evm_main.c
    >> @@ -36,42 +36,36 @@ static const char * const integrity_status_msg[] = {
    >> int evm_hmac_attrs;
    >>
    >> static struct xattr_list evm_config_default_xattrnames[] = {
    >> - {.name = XATTR_NAME_SELINUX,
    >> -#ifdef CONFIG_SECURITY_SELINUX
    >> - .enabled = true
    >> -#endif
    >> + {
    >> + .name = XATTR_NAME_SELINUX,
    >> + .enabled = IS_ENABLED(CONFIG_SECURITY_SELINUX)
    >> },
    >> - {.name = XATTR_NAME_SMACK,
    >> -#ifdef CONFIG_SECURITY_SMACK
    >> - .enabled = true
    >> -#endif
    >> + {
    >> + .name = XATTR_NAME_SMACK,
    >> + .enabled = IS_ENABLED(CONFIG_SECURITY_SMACK)
    >> },
    >> - {.name = XATTR_NAME_SMACKEXEC,
    >> -#ifdef CONFIG_EVM_EXTRA_SMACK_XATTRS
    >> - .enabled = true
    >> -#endif
    >> + {
    >> + .name = XATTR_NAME_SMACKEXEC,
    >> + .enabled = IS_ENABLED(CONFIG_EVM_EXTRA_SMACK_XATTRS)
    >> },
    >> - {.name = XATTR_NAME_SMACKTRANSMUTE,
    >> -#ifdef CONFIG_EVM_EXTRA_SMACK_XATTRS
    >> - .enabled = true
    >> -#endif
    >> + {
    >> + .name = XATTR_NAME_SMACKTRANSMUTE,
    >> + .enabled = IS_ENABLED(CONFIG_EVM_EXTRA_SMACK_XATTRS)
    >> },
    >> - {.name = XATTR_NAME_SMACKMMAP,
    >> -#ifdef CONFIG_EVM_EXTRA_SMACK_XATTRS
    >> - .enabled = true
    >> -#endif
    >> + {
    >> + .name = XATTR_NAME_SMACKMMAP,
    >> + .enabled = IS_ENABLED(CONFIG_EVM_EXTRA_SMACK_XATTRS)
    >> },
    >> - {.name = XATTR_NAME_APPARMOR,
    >> -#ifdef CONFIG_SECURITY_APPARMOR
    >> - .enabled = true
    >> -#endif
    >> + {
    >> + .name = XATTR_NAME_APPARMOR,
    >> + .enabled = IS_ENABLED(CONFIG_SECURITY_APPARMOR)
    >> },
    >> - {.name = XATTR_NAME_IMA,
    >> -#ifdef CONFIG_IMA_APPRAISE
    >> - .enabled = true
    >> -#endif
    >> + {
    >> + .name = XATTR_NAME_IMA,
    >> + .enabled = IS_ENABLED(CONFIG_IMA_APPRAISE)
    >> },
    >> - {.name = XATTR_NAME_CAPS,
    >> + {
    >> + .name = XATTR_NAME_CAPS,
    >> .enabled = true
    >> },
    >> };
    >

    \
     
     \ /
      Last update: 2022-06-21 13:00    [W:4.040 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site