diff options
author | Xiaotian Feng <dfeng@redhat.com> | 2010-02-24 05:39:02 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-15 12:05:50 -0400 |
commit | 58ec4abc2202c36a4d12fd95f7030b977cc7b91d (patch) | |
tree | e3f39e8f1e715303925888a913b66dda429f2f62 /security | |
parent | 9bd97ecab811f5bce4a0e9d7e316d2559fa4be65 (diff) |
security: fix error return path in ima_inode_alloc
commit baac35c4155a8aa826c70acee6553368ca5243a2 upstream.
If radix_tree_preload is failed in ima_inode_alloc, we don't need
radix_tree_preload_end because kernel is alread preempt enabled
Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'security')
-rw-r--r-- | security/integrity/ima/ima_iint.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/integrity/ima/ima_iint.c b/security/integrity/ima/ima_iint.c index 0d83edcfc402..2d4d05d92fda 100644 --- a/security/integrity/ima/ima_iint.c +++ b/security/integrity/ima/ima_iint.c | |||
@@ -63,12 +63,11 @@ int ima_inode_alloc(struct inode *inode) | |||
63 | spin_lock(&ima_iint_lock); | 63 | spin_lock(&ima_iint_lock); |
64 | rc = radix_tree_insert(&ima_iint_store, (unsigned long)inode, iint); | 64 | rc = radix_tree_insert(&ima_iint_store, (unsigned long)inode, iint); |
65 | spin_unlock(&ima_iint_lock); | 65 | spin_unlock(&ima_iint_lock); |
66 | radix_tree_preload_end(); | ||
66 | out: | 67 | out: |
67 | if (rc < 0) | 68 | if (rc < 0) |
68 | kmem_cache_free(iint_cache, iint); | 69 | kmem_cache_free(iint_cache, iint); |
69 | 70 | ||
70 | radix_tree_preload_end(); | ||
71 | |||
72 | return rc; | 71 | return rc; |
73 | } | 72 | } |
74 | 73 | ||