From: Zhang Tianxing <zhangtianxing3@huawei.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I4O25G CVE: NA -------------------------------- This reverts commit 11047edeffe7e92b00dda3f885ac255ea2f32218. Signed-off-by: Zhang Tianxing <zhangtianxing3@huawei.com> Acked-by: Xie XiuQi <xiexiuqi@huawei.com> Acked-by: Xiu Jianfeng<xiujianfeng@huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com> --- security/integrity/ima/ima_policy.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 8b7ca11e82f7..35ec2c8f2069 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -208,13 +208,6 @@ static struct ima_rule_entry build_appraise_rules[] __ro_after_init = { {.action = APPRAISE, .func = POLICY_CHECK, .flags = IMA_FUNC | IMA_DIGSIG_REQUIRED}, #endif -#if !defined(CONFIG_IMA_APPRAISE_REQUIRE_MODULE_SIGS) && \ - !defined(CONFIG_IMA_APPRAISE_REQUIRE_FIRMWARE_SIGS) && \ - !defined(CONFIG_IMA_APPRAISE_REQUIRE_KEXEC_SIGS) && \ - !defined(CONFIG_IMA_APPRAISE_REQUIRE_POLICY_SIGS) - /* Add a member to avoid a zero length array */ - {.action = UNKNOWN, .func = NONE, .flags = 0}, -#endif }; static struct ima_rule_entry secure_boot_rules[] __ro_after_init = { -- 2.20.1