aboutsummaryrefslogtreecommitdiffstats
path: root/security/integrity/ima/ima_crypto.c
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2009-05-21 15:43:32 -0400
committerJames Morris <jmorris@namei.org>2009-05-22 09:34:21 +1000
commit932995f0ce52525b32ff5127b522c2c164de3810 (patch)
tree648cfe2ac09025eb3922d2a84ed983a7ac70a060 /security/integrity/ima/ima_crypto.c
parent5789ba3bd0a3cd20df5980ebf03358f2eb44fd67 (diff)
downloadkernel_goldelico_gta04-932995f0ce52525b32ff5127b522c2c164de3810.zip
kernel_goldelico_gta04-932995f0ce52525b32ff5127b522c2c164de3810.tar.gz
kernel_goldelico_gta04-932995f0ce52525b32ff5127b522c2c164de3810.tar.bz2
IMA: Add __init notation to ima functions
A number of IMA functions only used during init are not marked with __init. Add those notations so they are freed automatically. Signed-off-by: Eric Paris <eparis@redhat.com> Acked-by: Mimi Zohar <zohar@us.ibm.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/integrity/ima/ima_crypto.c')
-rw-r--r--security/integrity/ima/ima_crypto.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c
index 50d572b..63003a6 100644
--- a/security/integrity/ima/ima_crypto.c
+++ b/security/integrity/ima/ima_crypto.c
@@ -103,7 +103,7 @@ int ima_calc_template_hash(int template_len, void *template, char *digest)
return rc;
}
-static void ima_pcrread(int idx, u8 *pcr)
+static void __init ima_pcrread(int idx, u8 *pcr)
{
if (!ima_used_chip)
return;
@@ -115,7 +115,7 @@ static void ima_pcrread(int idx, u8 *pcr)
/*
* Calculate the boot aggregate hash
*/
-int ima_calc_boot_aggregate(char *digest)
+int __init ima_calc_boot_aggregate(char *digest)
{
struct hash_desc desc;
struct scatterlist sg;