Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85a17f55 authored by Eric Paris's avatar Eric Paris Committed by Al Viro
Browse files

ima: call ima_inode_free ima_inode_free 



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: default avatarEric Paris <eparis@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e0d5bd2a

security/integrity/ima/ima.h

+0 −1
Original line number Diff line number Diff line
@@ -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_find_get(struct inode *inode);

void ima_iint_delete(struct inode *inode);

void iint_free(struct kref *kref);

void iint_rcu_free(struct rcu_head *rcu);

security/integrity/ima/ima_iint.c

+2 −4
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#include <linux/radix-tree.h>

#include "ima.h"



#define ima_iint_delete ima_inode_free



RADIX_TREE(ima_iint_store, GFP_ATOMIC);

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

 *

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