iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ima: call ima_inode_free ima_inode_free

Browse Source 
ima_inode_free() has some funky #define just to confuse the crap out of me.

void ima_iint_delete(struct inode *inode)

and then things actually call ima_inode_free() and nothing calls
ima_iint_delete().

Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Eric Paris 2009-12-04 15:48:08 -05:00 committed by Al Viro
parent e0d5bd2aec
commit 85a17f552d
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
security/integrity/ima/ima.h
View File

@ -127,7 +127,6 @@ void ima_template_show(struct seq_file *m, void *e,
*/ */
struct ima_iint_cache *ima_iint_insert(struct inode *inode); struct ima_iint_cache *ima_iint_insert(struct inode *inode);
struct ima_iint_cache *ima_iint_find_get(struct inode *inode); struct ima_iint_cache *ima_iint_find_get(struct inode *inode);
void ima_iint_delete(struct inode *inode);
void iint_free(struct kref *kref); void iint_free(struct kref *kref);
void iint_rcu_free(struct rcu_head *rcu); void iint_rcu_free(struct rcu_head *rcu);

6
security/integrity/ima/ima_iint.c
View File

@ -19,8 +19,6 @@
#include <linux/radix-tree.h> #include <linux/radix-tree.h>
#include "ima.h" #include "ima.h"
#define ima_iint_delete ima_inode_free
RADIX_TREE(ima_iint_store, GFP_ATOMIC); RADIX_TREE(ima_iint_store, GFP_ATOMIC);
DEFINE_SPINLOCK(ima_iint_lock); DEFINE_SPINLOCK(ima_iint_lock);
@ -111,12 +109,12 @@ void iint_rcu_free(struct rcu_head *rcu_head)
} }
/** /**
* ima_iint_delete - called on integrity_inode_free * ima_inode_free - called on security_inode_free
* @inode: pointer to the inode * @inode: pointer to the inode
* *
* Free the integrity information(iint) associated with an inode. * Free the integrity information(iint) associated with an inode.
*/ */
void ima_iint_delete(struct inode *inode) void ima_inode_free(struct inode *inode)
{ {
struct ima_iint_cache *iint; struct ima_iint_cache *iint;