ima: replace iint spinblock with rwlock/read_lock

[pandora-kernel.git] / security / integrity / iint.c

diff --git a/security/integrity/iint.c b/security/integrity/iint.c
index 399641c..d82a5a1 100644 (file)
--- a/security/integrity/iint.c
+++ b/security/integrity/iint.c
@@ -22,7 +22,7 @@
 #include "integrity.h"
 
 static struct rb_root integrity_iint_tree = RB_ROOT;
-static DEFINE_SPINLOCK(integrity_iint_lock);
+static DEFINE_RWLOCK(integrity_iint_lock);
 static struct kmem_cache *iint_cache __read_mostly;
 
 int iint_initialized;
@@ -35,8 +35,6 @@ static struct integrity_iint_cache *__integrity_iint_find(struct inode *inode)
        struct integrity_iint_cache *iint;
        struct rb_node *n = integrity_iint_tree.rb_node;
 
-       assert_spin_locked(&integrity_iint_lock);
-
        while (n) {
                iint = rb_entry(n, struct integrity_iint_cache, rb_node);
 
@@ -63,9 +61,9 @@ struct integrity_iint_cache *integrity_iint_find(struct inode *inode)
        if (!IS_IMA(inode))
                return NULL;
 
-       spin_lock(&integrity_iint_lock);
+       read_lock(&integrity_iint_lock);
        iint = __integrity_iint_find(inode);
-       spin_unlock(&integrity_iint_lock);
+       read_unlock(&integrity_iint_lock);
 
        return iint;
 }
@@ -74,59 +72,53 @@ static void iint_free(struct integrity_iint_cache *iint)
 {
        iint->version = 0;
        iint->flags = 0UL;
+       iint->ima_status = INTEGRITY_UNKNOWN;
        iint->evm_status = INTEGRITY_UNKNOWN;
        kmem_cache_free(iint_cache, iint);
 }
 
 /**
- * integrity_inode_alloc - allocate an iint associated with an inode
+ * integrity_inode_get - find or allocate an iint associated with an inode
  * @inode: pointer to the inode
+ * @return: allocated iint
+ *
+ * Caller must lock i_mutex
  */
-int integrity_inode_alloc(struct inode *inode)
+struct integrity_iint_cache *integrity_inode_get(struct inode *inode)
 {
        struct rb_node **p;
-       struct rb_node *new_node, *parent = NULL;
-       struct integrity_iint_cache *new_iint, *test_iint;
-       int rc;
+       struct rb_node *node, *parent = NULL;
+       struct integrity_iint_cache *iint, *test_iint;
 
-       new_iint = kmem_cache_alloc(iint_cache, GFP_NOFS);
-       if (!new_iint)
-               return -ENOMEM;
+       iint = integrity_iint_find(inode);
+       if (iint)
+               return iint;
 
-       new_iint->inode = inode;
-       new_node = &new_iint->rb_node;
+       iint = kmem_cache_alloc(iint_cache, GFP_NOFS);
+       if (!iint)
+               return NULL;
 
-       mutex_lock(&inode->i_mutex);    /* i_flags */
-       spin_lock(&integrity_iint_lock);
+       write_lock(&integrity_iint_lock);
 
        p = &integrity_iint_tree.rb_node;
        while (*p) {
                parent = *p;
                test_iint = rb_entry(parent, struct integrity_iint_cache,
                                     rb_node);
-               rc = -EEXIST;
                if (inode < test_iint->inode)
                        p = &(*p)->rb_left;
-               else if (inode > test_iint->inode)
-                       p = &(*p)->rb_right;
                else
-                       goto out_err;
+                       p = &(*p)->rb_right;
        }
 
+       iint->inode = inode;
+       node = &iint->rb_node;
        inode->i_flags |= S_IMA;
-       rb_link_node(new_node, parent, p);
-       rb_insert_color(new_node, &integrity_iint_tree);
+       rb_link_node(node, parent, p);
+       rb_insert_color(node, &integrity_iint_tree);
 
-       spin_unlock(&integrity_iint_lock);
-       mutex_unlock(&inode->i_mutex);  /* i_flags */
-
-       return 0;
-out_err:
-       spin_unlock(&integrity_iint_lock);
-       mutex_unlock(&inode->i_mutex);  /* i_flags */
-       iint_free(new_iint);
-
-       return rc;
+       write_unlock(&integrity_iint_lock);
+       return iint;
 }
 
 /**
@@ -142,10 +134,10 @@ void integrity_inode_free(struct inode *inode)
        if (!IS_IMA(inode))
                return;
 
-       spin_lock(&integrity_iint_lock);
+       write_lock(&integrity_iint_lock);
        iint = __integrity_iint_find(inode);
        rb_erase(&iint->rb_node, &integrity_iint_tree);
-       spin_unlock(&integrity_iint_lock);
+       write_unlock(&integrity_iint_lock);
 
        iint_free(iint);
 }
@@ -157,7 +149,7 @@ static void init_once(void *foo)
        memset(iint, 0, sizeof *iint);
        iint->version = 0;
        iint->flags = 0UL;
-       mutex_init(&iint->mutex);
+       iint->ima_status = INTEGRITY_UNKNOWN;
        iint->evm_status = INTEGRITY_UNKNOWN;
 }