mirror of
https://github.com/torvalds/linux
synced 2024-10-14 15:29:13 +00:00
evm: Use IS_ENABLED to initialize .enabled
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> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
This commit is contained in:
parent
067d252187
commit
c808a6ec71
|
@ -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
|
||||
},
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue