]> git.baikalelectronics.ru Git - kernel.git/commit
ima: Remove __init annotation from ima_pcrread()
authorRoberto Sassu <roberto.sassu@huawei.com>
Sun, 7 Jun 2020 21:00:29 +0000 (23:00 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Jun 2020 23:03:09 +0000 (16:03 -0700)
commitf6960ecc9bb183ec9fafbd42ad2379ddb27139c3
tree3f030f532cfd70fa2f5b79f0d85d089c3f5e4eba
parent4157207a60261f17a3cb5e92795dfc80ad55f1e3
ima: Remove __init annotation from ima_pcrread()

Commit bf9d70df9012 ("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: bf9d70df9012 ("ima: Call ima_calc_boot_aggregate() in ima_eventdigest_init()")
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
security/integrity/ima/ima_crypto.c