diff options
| author | Xiaotian Feng <dfeng@redhat.com> | 2010-02-24 05:39:02 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-02-24 15:54:33 -0500 |
| commit | baac35c4155a8aa826c70acee6553368ca5243a2 (patch) | |
| tree | 3a930979c48c83e4f07234ed05ef67caeb869bac | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
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>
| -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 | ||
