]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
Commit 6cc7c266e5b4 ("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: 6cc7c266e5b4 ("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

index ba5cc3264240ae4eaf20f61c3c81046cf16de99c..220b14920c377affdc405a25d1222ad4cff4aa31 100644 (file)
@@ -786,7 +786,7 @@ int ima_calc_buffer_hash(const void *buf, loff_t len,
        return calc_buffer_shash(buf, len, hash);
 }
 
-static void __init ima_pcrread(u32 idx, struct tpm_digest *d)
+static void ima_pcrread(u32 idx, struct tpm_digest *d)
 {
        if (!ima_tpm_chip)
                return;