adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

IMA: Add __init notation to ima functions

Browse source 
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>
This commit is contained in:
Eric Paris 2009-05-21 15:43:32 -04:00 committed by James Morris
parent 5789ba3bd0
commit 932995f0ce
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
security/integrity/ima/ima_crypto.c
View file

@ -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;

2
security/integrity/ima/ima_fs.c
View file

@ -319,7 +319,7 @@ static struct file_operations ima_measure_policy_ops = {
.release = ima_release_policy
};
int ima_fs_init(void)
int __init ima_fs_init(void)
{
ima_dir = securityfs_create_dir("ima", NULL);
if (IS_ERR(ima_dir))

2
security/integrity/ima/ima_iint.c
View file

@ -196,7 +196,7 @@ static void init_once(void *foo)
kref_set(&iint->refcount, 1);
}
void ima_iintcache_init(void)
void __init ima_iintcache_init(void)
{
iint_cache =
kmem_cache_create("iint_cache", sizeof(struct ima_iint_cache), 0,

4
security/integrity/ima/ima_init.c
View file

@ -38,7 +38,7 @@ int ima_used_chip;
* a different value.) Violations add a zero entry to the measurement
* list and extend the aggregate PCR value with ff...ff's.
*/
static void ima_add_boot_aggregate(void)
static void __init ima_add_boot_aggregate(void)
{
struct ima_template_entry *entry;
const char *op = "add_boot_aggregate";
@ -71,7 +71,7 @@ err_out:
audit_cause, result, 0);
}
int ima_init(void)
int __init ima_init(void)
{
u8 pcr_i[IMA_DIGEST_SIZE];
int rc;

2
security/integrity/ima/ima_policy.c
View file

@ -178,7 +178,7 @@ int ima_match_policy(struct inode *inode, enum ima_hooks func, int mask)
* ima_measure points to either the measure_default_rules or the
* the new measure_policy_rules.
*/
void ima_init_policy(void)
void __init ima_init_policy(void)
{
int i, entries;