From: Zhang Tianxing zhangtianxing3@huawei.com
hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I4O25G CVE: NA
--------------------------------
This reverts commit 44598ce37355e304ada1a77f83c612144e7720fb.
Signed-off-by: Zhang Tianxing zhangtianxing3@huawei.com Acked-by: Xie XiuQi xiexiuqi@huawei.com Acked-by: Xiu Jianfengxiujianfeng@huawei.com Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com --- security/integrity/digsig.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c index c866a5c2c9b1..2c923dc0dbd3 100644 --- a/security/integrity/digsig.c +++ b/security/integrity/digsig.c @@ -74,11 +74,8 @@ static struct key_tag *domain_tag_from_id(const unsigned int id) return ERR_PTR(-EINVAL);
if (id == INTEGRITY_KEYRING_IMA) -#ifdef CONFIG_IMA_NS return current->nsproxy->ima_ns->key_domain; -#else - return init_ima_ns.key_domain; -#endif + return NULL; }