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 11:37:19 -0700 |
| commit | 64c62f06bef8314a64d3189cb9c78062d54169b3 (patch) | |
| tree | 63f542bf6a0de4eb2c9742376f7c314ac78e65ec /security/integrity/ima/ima_main.c | |
| 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_main.c')
| -rw-r--r-- | security/integrity/ima/ima_main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index 5e3229c797f..1dccafef749 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -186,8 +186,6 @@ static void ima_file_free_iint(struct ima_iint_cache *iint, struct inode *inode, spin_unlock(&inode->i_lock); mutex_unlock(&iint->mutex); - - kref_put(&iint->refcount, iint_free); } static void ima_file_free_noiint(struct inode *inode, struct file *file) @@ -213,7 +211,7 @@ void ima_file_free(struct file *file) if (!iint_initialized || !S_ISREG(inode->i_mode)) return; - iint = ima_iint_find_get(inode); + iint = ima_iint_find(inode); if (iint) ima_file_free_iint(iint, inode, file); @@ -236,7 +234,7 @@ static int process_measurement(struct file *file, const unsigned char *filename, if (rc != 0) return rc; retry: - iint = ima_iint_find_get(inode); + iint = ima_iint_find(inode); if (!iint) { rc = ima_inode_alloc(inode); if (!rc || rc == -EEXIST) @@ -255,7 +253,6 @@ retry: ima_store_measurement(iint, file, filename); out: mutex_unlock(&iint->mutex); - kref_put(&iint->refcount, iint_free); return rc; } |