diff options
author | Eric Paris <eparis@redhat.com> | 2010-10-25 14:42:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 14:37:19 -0400 |
commit | 64c62f06bef8314a64d3189cb9c78062d54169b3 (patch) | |
tree | 63f542bf6a0de4eb2c9742376f7c314ac78e65ec /security/integrity/ima/ima.h | |
parent | bc7d2a3e66b40477270c3cbe3b89b47093276e7a (diff) |
IMA: drop refcnt from ima_iint_cache since it isn't needed
Since finding a struct ima_iint_cache requires a valid struct inode, and
the struct ima_iint_cache is supposed to have the same lifetime as a
struct inode (technically they die together but don't need to be created
at the same time) we don't have to worry about the ima_iint_cache
outliving or dieing before the inode. So the refcnt isn't useful. Just
get rid of it and free the structure when the inode is freed.
Signed-off-by: Eric Paris <eapris@redhat.com>
Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'security/integrity/ima/ima.h')
-rw-r--r-- | security/integrity/ima/ima.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index 27849e1656dc..ac79032bdf23 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h | |||
@@ -107,7 +107,6 @@ struct ima_iint_cache { | |||
107 | unsigned char flags; | 107 | unsigned char flags; |
108 | u8 digest[IMA_DIGEST_SIZE]; | 108 | u8 digest[IMA_DIGEST_SIZE]; |
109 | struct mutex mutex; /* protects: version, flags, digest */ | 109 | struct mutex mutex; /* protects: version, flags, digest */ |
110 | struct kref refcount; /* ima_iint_cache reference count */ | ||
111 | }; | 110 | }; |
112 | 111 | ||
113 | /* LIM API function definitions */ | 112 | /* LIM API function definitions */ |
@@ -125,8 +124,7 @@ void ima_template_show(struct seq_file *m, void *e, | |||
125 | * integrity data associated with an inode. | 124 | * integrity data associated with an inode. |
126 | */ | 125 | */ |
127 | struct ima_iint_cache *ima_iint_insert(struct inode *inode); | 126 | struct ima_iint_cache *ima_iint_insert(struct inode *inode); |
128 | struct ima_iint_cache *ima_iint_find_get(struct inode *inode); | 127 | struct ima_iint_cache *ima_iint_find(struct inode *inode); |
129 | void iint_free(struct kref *kref); | ||
130 | 128 | ||
131 | /* IMA policy related functions */ | 129 | /* IMA policy related functions */ |
132 | enum ima_hooks { FILE_CHECK = 1, FILE_MMAP, BPRM_CHECK }; | 130 | enum ima_hooks { FILE_CHECK = 1, FILE_MMAP, BPRM_CHECK }; |