diff options
| author | Xiaotian Feng <dfeng@redhat.com> | 2010-02-24 18:39:02 +0800 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-02-25 07:54:33 +1100 |
| commit | baac35c4155a8aa826c70acee6553368ca5243a2 (patch) | |
| tree | 3a930979c48c83e4f07234ed05ef67caeb869bac /security/integrity/ima | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
| download | kernel_samsung_espresso10-baac35c4155a8aa826c70acee6553368ca5243a2.zip kernel_samsung_espresso10-baac35c4155a8aa826c70acee6553368ca5243a2.tar.gz kernel_samsung_espresso10-baac35c4155a8aa826c70acee6553368ca5243a2.tar.bz2 | |
security: fix error return path in ima_inode_alloc
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>
Diffstat (limited to 'security/integrity/ima')
| -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 0d83edc..2d4d05d 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) spin_lock(&ima_iint_lock); rc = radix_tree_insert(&ima_iint_store, (unsigned long)inode, iint); spin_unlock(&ima_iint_lock); + radix_tree_preload_end(); out: if (rc < 0) kmem_cache_free(iint_cache, iint); - radix_tree_preload_end(); - return rc; } |