aboutsummaryrefslogtreecommitdiffstats
path: root/security/integrity
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2009-02-20 17:28:29 -0500
committerJames Morris <jmorris@namei.org>2009-02-22 17:54:53 -0500
commitbe38e0fd5f90a91d09e0a85ffb294b70a7be6259 (patch)
tree8e48b770e6c2012185fd68c0a1098991ad3c56cb /security/integrity
parent1581e7ddbdd97443a134e1a0cc9d81256baf77a4 (diff)
integrity: ima iint radix_tree_lookup locking fix
Based on Andrew Morton's comments: - add missing locks around radix_tree_lookup in ima_iint_insert() Signed-off-by: Mimi Zohar <zohar@us.ibm.com> Cc: James Morris <jmorris@namei.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/integrity')
-rw-r--r--security/integrity/ima/ima_iint.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/security/integrity/ima/ima_iint.c b/security/integrity/ima/ima_iint.c
index 1f035e8d29c7..ec79f1ee992c 100644
--- a/security/integrity/ima/ima_iint.c
+++ b/security/integrity/ima/ima_iint.c
@@ -73,8 +73,10 @@ out:
73 if (rc < 0) { 73 if (rc < 0) {
74 kmem_cache_free(iint_cache, iint); 74 kmem_cache_free(iint_cache, iint);
75 if (rc == -EEXIST) { 75 if (rc == -EEXIST) {
76 spin_lock(&ima_iint_lock);
76 iint = radix_tree_lookup(&ima_iint_store, 77 iint = radix_tree_lookup(&ima_iint_store,
77 (unsigned long)inode); 78 (unsigned long)inode);
79 spin_unlock(&ima_iint_lock);
78 } else 80 } else
79 iint = NULL; 81 iint = NULL;
80 } 82 }