提交 5d5e7cc3 编写于 作者: Z Zhang Tianxing 提交者: Zheng Zengkai

Revert "ima: fix a potential crash owing to the compiler optimisation"

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4O25G
CVE: NA

--------------------------------

This reverts commit 11047ede.
Signed-off-by: NZhang Tianxing <zhangtianxing3@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
Acked-by: Xiu Jianfeng<xiujianfeng@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 699925be
...@@ -208,13 +208,6 @@ static struct ima_rule_entry build_appraise_rules[] __ro_after_init = { ...@@ -208,13 +208,6 @@ static struct ima_rule_entry build_appraise_rules[] __ro_after_init = {
{.action = APPRAISE, .func = POLICY_CHECK, {.action = APPRAISE, .func = POLICY_CHECK,
.flags = IMA_FUNC | IMA_DIGSIG_REQUIRED}, .flags = IMA_FUNC | IMA_DIGSIG_REQUIRED},
#endif #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 = { static struct ima_rule_entry secure_boot_rules[] __ro_after_init = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册