提交 d073934a 编写于 作者: R Roberto Sassu 提交者: Yongqiang Liu

ima: Remove __init annotation from ima_pcrread()

stable inclusion
from stable-v4.19.169
commit de581e41716795ce93506f3e5b0200048aa4439c
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5047U
CVE: NA

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

commit 8b8c704d upstream.

Commit 6cc7c266 ("ima: Call ima_calc_boot_aggregate() in
ima_eventdigest_init()") added a call to ima_calc_boot_aggregate() so that
the digest can be recalculated for the boot_aggregate measurement entry if
the 'd' template field has been requested. For the 'd' field, only SHA1 and
MD5 digests are accepted.

Given that ima_eventdigest_init() does not have the __init annotation, all
functions called should not have it. This patch removes __init from
ima_pcrread().

Cc: stable@vger.kernel.org
Fixes:  6cc7c266 ("ima: Call ima_calc_boot_aggregate() in ima_eventdigest_init()")
Reported-by: NLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: NRoberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NWang Weiyang <wangweiyang2@huawei.com>
Reviewed-by: NXiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: NYongqiang Liu <liuyongqiang13@huawei.com>
上级 b7a7cb07
......@@ -651,7 +651,7 @@ int ima_calc_buffer_hash(const void *buf, loff_t len,
return calc_buffer_shash(buf, len, hash);
}
static void __init ima_pcrread(int idx, u8 *pcr)
static void ima_pcrread(int idx, u8 *pcr)
{
if (!ima_tpm_chip)
return;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册